Merge remote-tracking branch 'remotes/Coacher/mpv-verbump-to-0.15.0'

Pull request: https://github.com/gentoo/gentoo/pull/675

1617 files changed, 16800 insertions, 8709 deletions

diff --git a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
index 0097a1c2d92b..a4112c0cb016 100644
--- a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.1-r2.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$
 
@@ -17,7 +17,7 @@ DEPEND=">=virtual/jdk-1.4
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc jsapi mbrola"
 
 src_unpack() {
diff --git a/app-accessibility/freetts/freetts-1.2.2.ebuild b/app-accessibility/freetts/freetts-1.2.2.ebuild
index 37676c28939a..4f4367cb5f40 100644
--- a/app-accessibility/freetts/freetts-1.2.2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2.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$
 
@@ -22,7 +22,7 @@ DEPEND=">=virtual/jdk-1.4
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="jsapi mbrola"
 
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 0b99cad1e8e4..17e41fe0dbc0 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,6 +1,2 @@
-DIST haskell-updater-1.2.1.tar.gz 23932 SHA256 f43e7de3b4dca950d6c9cbcb10507f314813bb4c59bd912f9e7772fdb60c0a2b SHA512 20939e4afb3870b0220c1a814b0f9f9ec0bea1fc2e59891323bdbea41adf8e84bdff15014746d0ab0983ce2a34becf7b5f078a38edf63748c23fe08dcadbcf66 WHIRLPOOL 78b1bfcf4d208c26f163938a2e0ea2810f238cbca07664692175ef7388f4a9c81d49803b2a27c1405c46bc75fcb13430caa00b877a118d28295d1af4d74a0f52
-DIST haskell-updater-1.2.3.tar.gz 24126 SHA256 ceeb713a817fddc0e6e7423f8e15c59f217ec28a79c300433942dc0b88555ad7 SHA512 7913d122e90efc431de9b9c494484a820209f436a72bbfa9288c87dd6fa142c39eb0a90efadf6a1e7e90e7e8b889a5f31eba867dee7eaeca17aaef0fe06abcc2 WHIRLPOOL 9b2f9a7e283956d9bdabcf33fca0bb0c2380a8dee9b8e8fc6b5139665e63845fdf7be3d1a172d128e41444d23a1573d09071911a26edc577fd88e67f29730c16
-DIST haskell-updater-1.2.6.tar.gz 24857 SHA256 74fa71b530e3c88f944d3f4013a4c41c95af5e42ac0ec2ac25716578e1965a9e SHA512 1be777b40fcad2cfdfe461c8bce8ffed0449dbd6bfb665881da1cf763699626d9183a5affbdaba0e8243cf4ce956caab1d54a9c4637d10d1642e8da3764bcedf WHIRLPOOL 0af59cbd5a937cbf7261fd02e6a39bf6006e484532883381fdb6818fe993bb3ae0fd0993b9d32620341872f7e02d9e40e5816f4c97928508128f72dbfc6cc38e
-DIST haskell-updater-1.2.7.tar.gz 25065 SHA256 eb00acc19070a3c1ad4d92f9c3ec22ceec8e2a758deb5d05e4a0d64ccef9d271 SHA512 d8f73967fd22182d62c57cf71af18dd123ac6439a5436ba5639f5c9ce2df72e2f3d1382d3f23219ec89848175426df68cf67474d5b7db8194f0c868f9e504f1a WHIRLPOOL a0b118cd8376dd57ef7929cc212c88eedf45909f68d9cbda89da8e97907f7937e6eb90d88516dfa2540d75145b8d88a85dfda65c61e01e77c531030e1253a8c4
-DIST haskell-updater-1.2.8.tar.gz 25192 SHA256 fddc7dcad9bb65fc8b6caef393a6657028dae54b4cf4c37a08ef8da047207776 SHA512 6bfd101c5f6de3b4ddf4a4f485a2a60df218c11778fa8ae9b7245972a666f05aa17c3c093e922233d7f3243a87e3401ff7902d5b8ad7dc43018ac5627458de8d WHIRLPOOL 840284831300581fa2809cd9f1394891ae4381fd1e67c26dfb2938d0be0daf639313ac3b97b1521ed070623ff97ba327cfcc3f2eb02c39dbb74a56e25d83c0e0
+DIST haskell-updater-1.2.10.tar.gz 26586 SHA256 e9712ccaa38bb2ca4242272eee72c72e5b2d0943d7d35c846fccdd89a5428e7d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c WHIRLPOOL 930975884f1f2b3ae47902cf3e4e88894ee7d4227dbf8bbd06e4f893d00bd715eae5ffd5c78375edf9d43f853da0fcac856492520de350ca1d044ee9da6a1dca
 DIST haskell-updater-1.2.9.tar.gz 26675 SHA256 eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859 SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da WHIRLPOOL e28c55e9bd2d9033b42fb42e2db6ff2911a2fb50a5d1ad276d6344ca29b4b05abf73d746604ced6766b983d8a7e6e688534be28ba61f0c62f8aca20d9a46c669
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.1.ebuild
deleted file mode 100644
index 77b17dc63d8c..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-
-	# for ghc snapshots (usually come with unstable Cabal API)
-	cabal_chdeps \
-		'Cabal >= 1.8 && < 1.19' 'Cabal >= 1.8 && < 1.21' \
-		'process    < 1.2' 'process    < 1.3'
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index 15b7da1b59ba..0affb065cee1 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild
deleted file mode 100644
index c3294384161b..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.6.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
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore
-		sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.7.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.7.ebuild
deleted file mode 100644
index c3294384161b..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.7.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
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore
-		sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.8.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.8.ebuild
deleted file mode 100644
index c3294384161b..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.8.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
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore
-		sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index ccf14817f6b0..d0bad8cbbcc1 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1 +1,2 @@
 DIST KeePass-2.30-Source.zip 4767753 SHA256 4a3c3c217bc05b13bf903612b89a09b67ed1df68fdecd83324f2ef372313e9e4 SHA512 05404f273f6a7df33887b036aa0dba335124a7b2ae30b61957f8dc9c959cdd3342fdfa22a7d59ba5e9180f039fed5ecbac0a3154eb9d342a5a3a8a057d763182 WHIRLPOOL 4ddec9e592724b60724a2deaaf959dacc91f77d1ae97dd07af940f8efd882a008b4424ba68a4fcbd9ebe8d75c2b8a9a644ff7144ed593cfb3f0e361c0364a780
+DIST KeePass-2.31-Source.zip 4714301 SHA256 555b1a30f374f7077bf15906b09ab36b40fd3fc5753673a3c0ee3f30f0ed7881 SHA512 e2e81e7d60bc58a18ea3b9a82741bdd6e5be88bcfcf447ae587f6177a8ff97e7c82c02fb0695142f8321c7b5f92aa982254629928dd0c12393d659380f46026d WHIRLPOOL b8b572bd7db7ce9bc67ae0a241c71cd30595753d06bfed85efafece2b3cce4893c5cc213ee44cabd81c6ff12fc2fc98234d845ed94d0068d8111d116ccc39333
diff --git a/app-admin/keepass/keepass-2.31.ebuild b/app-admin/keepass/keepass-2.31.ebuild
new file mode 100644
index 000000000000..cac738ec62ce
--- /dev/null
+++ b/app-admin/keepass/keepass-2.31.ebuild
@@ -0,0 +1,110 @@
+# 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 mono-env multilib
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND=">=dev-lang/mono-2.10.5"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Remove Windows-specific things
+	pushd Build > /dev/null || die
+	. PrepMonoDev.sh || die
+	popd > /dev/null || die
+
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass
+	epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+	# bug # 558094
+	if has_version ">=dev-lang/mono-4" ; then
+		sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
+		sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
+	fi
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto /usr/share/${PN}/XSL
+	doins Ext/XSL/*
+
+	insinto /usr/$(get_libdir)/${PN}/
+	exeinto /usr/$(get_libdir)/${PN}/
+	doins Ext/KeePass.exe.config
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild b/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..ec9a5316151d
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.7.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# init type tasks
+	newconfd ext/default puppetserver
+	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	newins ext/default gentoo.conf
+	systemd_dounit ext/redhat/puppetserver.service
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+}
diff --git a/app-antivirus/clamav-unofficial-sigs/Manifest b/app-antivirus/clamav-unofficial-sigs/Manifest
index 6643c7fbb95a..fe50c9c7dac8 100644
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest
@@ -1,2 +1,3 @@
 DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188
 DIST clamav-unofficial-sigs-4.5.3.tar.gz 44580 SHA256 ca5f9af4be401eed470148c7108ffed043f9251d53dd99ceffd633849948d65b SHA512 8b3f26253657188a9bc8ece0f2096b3564cbc97baa208989d04fca8443f73d3e391414b96fba27be38569141c312e8c674b2d1c8ba9ae9d45b4b8af03cf70542 WHIRLPOOL c69f6e8b1771f6f82936a145224353114eee00dbe88b8715ba57242d9ffff1cd4b6e68c0d005e1925cfebee8b0c78fa896721f89b46b5f3a6c66cc2313eec04a
+DIST clamav-unofficial-sigs-4.9.2.tar.gz 40301 SHA256 70e05f63add7e03d5af2dba6bcd31fda98646577798d99e6902e5f264c302e93 SHA512 46ec2e59c3838f4cff88562eacbd00ee1ad108f8f45500b9cde268c3d46bd3f6be68ff6136b7f3a4f6b628ff0b24f5dd10b2199e611b473acd7df82abf27b2c8 WHIRLPOOL 3029ee278629c3e8cf5471564e7ff054fc335e066d03653df82d07a87fa0dda76e41c5572c93fd0f28a434d002f3bdadd60043540378504c289333092aca412a
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild
new file mode 100644
index 000000000000..c10fab81db62
--- /dev/null
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Download and install third-party clamav signatures"
+HOMEPAGE="https://github.com/extremeshok/${PN}"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# We need its user/group.
+DEPEND="app-antivirus/clamav"
+
+# The script relies on either net-misc/socat, or Perl's
+# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships
+# with IO::Socket::UNIX, so we can leave out net-misc/socat here.
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	dev-lang/perl
+	net-dns/bind-tools
+	net-misc/curl"
+
+src_prepare() {
+	# Fix the user/group in the config file to match the ones used by
+	# clamav.
+	local user_default="clam_user=\"clam\""
+	local user_gentoo="clam_user=\"clamav\""
+
+	local group_default="clam_group=\"clam\""
+	local group_gentoo="clam_group=\"clamav\""
+
+	# Log to someplace that (likely) already exists. Omit the
+	# "log_file_path" variable name so that we can reuse these patterns
+	# later to sed the logrotate file.
+	local log_default="/var/log/clamav-unofficial-sigs"
+	local log_gentoo="/var/log/clamav"
+
+	# clamd listens on a local socket by default. The clamd_socket
+	# setting needs to be uncommented in the configuration file for it
+	# to take effect.
+	local socket_default="#clamd_socket=\"/var/run/clamd.socket\""
+	local socket_gentoo="clamd_socket=\"/var/run/clamav/clamd.sock\""
+
+	# The clamav init script doesn't provide a "reload" command,
+	# so we reload very manually.
+	local reload_default="clamd_restart_opt=\"service clamd restart\""
+	local reload_gentoo="clamd_restart_opt=\"clamdscan --reload\""
+
+	sed -i -e "s~${user_default}~${user_gentoo}~" \
+		-e "s~${group_default}~${group_gentoo}~" \
+		-e "s~${log_default}~${log_gentoo}~" \
+		-e "s~${socket_default}~${socket_gentoo}~" \
+		-e "s~${reload_default}~${reload_gentoo}~" \
+		"${PN}.conf" \
+		|| die "failed to update paths in ${PN}.conf"
+
+	# Fix the log path and username in the logrotate file, too.
+	sed -i -e "s~${log_default}~${log_gentoo}~" \
+		-e "s~create 0644 clam clam~create 0640 clamav clamav~" \
+		"${PN}-logrotate" \
+		|| die "failed to update path and userin ${PN}-logrotate"
+
+	eapply_user
+}
+
+src_install() {
+	dosbin "${PN}.sh"
+
+	# The script's working directory (set in the conf file). By default,
+	# it runs as clamav/clamav.
+	diropts -m 0755 -o clamav -g clamav
+	dodir "/var/lib/${PN}"
+
+	insinto /etc/logrotate.d
+	doins "${PN}-logrotate"
+
+	insinto /etc
+	doins "${PN}.conf"
+
+	doman "${PN}.8"
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog ''
+	elog "You will need to select databases in /etc/${PN}.conf."
+	elog "For details, please see the ${PN}(8) manual page."
+	elog ''
+	elog 'An up-to-date description of the available Sanesecurity'
+	elog 'databases is available at,'
+	elog ''
+	elog '  http://sanesecurity.com/usage/signatures/'
+	elog ''
+}
diff --git a/app-backup/burp/burp-1.3.48-r1.ebuild b/app-backup/burp/burp-1.3.48-r1.ebuild
new file mode 100644
index 000000000000..a1f8e3fe712e
--- /dev/null
+++ b/app-backup/burp/burp-1.3.48-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="http://burp.grke.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://burp.grke.org/downloads/${P}/${P}.tar.bz2"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl afs ipv6 nls tcpd xattr"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-libs/uthash
+	sys-libs/libcap
+	<net-libs/librsync-2.0
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	acl? ( sys-apps/acl )
+	afs? ( net-fs/openafs )
+	nls? ( sys-devel/gettext )
+	tcpd? ( sys-apps/tcp-wrappers )
+	xattr? ( sys-apps/attr )
+	"
+RDEPEND="${DEPEND}
+	virtual/logger
+	"
+
+DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
+PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
+	"${FILESDIR}/${PV}-bedup-conf-path.patch"
+	"${FILESDIR}/${PV}-tinfo.patch"
+	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
+	)
+S="${WORKDIR}/burp"
+
+pkg_setup() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 "" "" "${PN}"
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	# see bug #426262
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir=/usr/sbin
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		$(use_enable acl)
+		$(use_enable afs)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable xattr)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	fowners root:burp /etc/burp /var/spool/burp
+	fperms 0775 /etc/burp /var/spool/burp
+	fowners root:burp /etc/burp/clientconfdir
+	fperms 0750 /etc/burp/clientconfdir
+	fowners root:burp /etc/burp/burp-server.conf
+	fperms 0640 /etc/burp/burp-server.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	dodoc docs/*
+
+	sed -e 's|^# user=graham|user = burp|' \
+		-e 's|^# group=nogroup|group = burp|' \
+		-e 's|^pidfile = .*|lockfile = /run/lock/burp/server.lock|' \
+		-i "${D}"/etc/burp/burp-server.conf || die
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/burp/CA/index.txt ]]; then
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  /etc/burp/burp-server.conf"
+		elog ""
+	fi
+}
diff --git a/app-backup/burp/burp-1.3.48.ebuild b/app-backup/burp/burp-1.3.48.ebuild
index 9d2da509b6c3..ca07f1dba48d 100644
--- a/app-backup/burp/burp-1.3.48.ebuild
+++ b/app-backup/burp/burp-1.3.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$
 
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/openssl:0
 	dev-libs/uthash
 	sys-libs/libcap
-	net-libs/librsync
+	<net-libs/librsync-2.0
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 	acl? ( sys-apps/acl )
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-tinfo.patch"
 	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
diff --git a/app-backup/burp/burp-1.3.8.ebuild b/app-backup/burp/burp-1.3.8-r1.ebuild
index 3a529b986f46..3c136e557d41 100644
--- a/app-backup/burp/burp-1.3.8.ebuild
+++ b/app-backup/burp/burp-1.3.8-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$
 
@@ -19,7 +19,7 @@ DEPEND="
 	dev-libs/openssl:0
 	dev-libs/uthash
 	sys-libs/libcap
-	net-libs/librsync
+	<net-libs/librsync-2.0
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 	acl? ( sys-apps/acl )
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
 	)
diff --git a/app-backup/burp/burp-1.4.40.ebuild b/app-backup/burp/burp-1.4.40-r1.ebuild
index 16d59fdf0494..edfa6afd52b2 100644
--- a/app-backup/burp/burp-1.4.40.ebuild
+++ b/app-backup/burp/burp-1.4.40-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$
 
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/openssl:0
 	dev-libs/uthash
 	sys-libs/libcap
-	net-libs/librsync
+	<net-libs/librsync-2.0
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 	acl? ( sys-apps/acl )
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-tinfo.patch"
 	)
diff --git a/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch
new file mode 100644
index 000000000000..2c570486ce02
--- /dev/null
+++ b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ac22a24..f99ce96 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,7 @@ all: Makefile
+ 	@for I in ${all_subdirs}; \
+ 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+ 	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo "";)); \
++			    echo ""; echo ""; exit 1;)) || exit 1; \
+ 	done
+ 
+ depend:
diff --git a/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch
new file mode 100644
index 000000000000..2c570486ce02
--- /dev/null
+++ b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ac22a24..f99ce96 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,7 @@ all: Makefile
+ 	@for I in ${all_subdirs}; \
+ 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+ 	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo "";)); \
++			    echo ""; echo ""; exit 1;)) || exit 1; \
+ 	done
+ 
+ depend:
diff --git a/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
new file mode 100644
index 000000000000..2c570486ce02
--- /dev/null
+++ b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ac22a24..f99ce96 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,7 @@ all: Makefile
+ 	@for I in ${all_subdirs}; \
+ 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+ 	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo "";)); \
++			    echo ""; echo ""; exit 1;)) || exit 1; \
+ 	done
+ 
+ depend:
diff --git a/app-benchmarks/contest/contest-0.61-r1.ebuild b/app-benchmarks/contest/contest-0.61-r1.ebuild
new file mode 100644
index 000000000000..27bf44b5d294
--- /dev/null
+++ b/app-benchmarks/contest/contest-0.61-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 flag-o-matic toolchain-funcs
+
+DESCRIPTION="Test system responsiveness to compare different kernels"
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/contest/"
+SRC_URI="http://members.optusnet.com.au/ckolivas/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-benchmarks/dbench-2.0"
+PATCHES=(
+	"${FILESDIR}/${PN}-fortify_sources.patch"
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_prepare () {
+	# fix #570250 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+	tc-export CC
+}
+src_compile() {
+	emake
+}
+
+src_install() {
+	dobin contest
+	doman contest.1
+	dodoc README
+}
diff --git a/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch b/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
new file mode 100644
index 000000000000..7e8c6b7eb6a2
--- /dev/null
+++ b/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
@@ -0,0 +1,22 @@
+--- contest-0.61/Makefile
++++ contest-0.61/Makefile
+@@ -1,8 +1,8 @@
+ INSTPATH=/usr
+ BIN=$(INSTPATH)/bin
+ MAN=$(INSTPATH)/man
+-CC=gcc
+-CFLAGS= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
++CC?=gcc
++CFLAGS?= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
+ 	-g -O2
+ 
+ ifeq ($(shell uname),FreeBSD)
+@@ -14,7 +14,7 @@
+      list_load.o
+ 
+ contest: $(objs)
+-	$(CC) $(CFLAGS) -o $@ $(objs) $(KVM)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) $(KVM)
+ contest.1.gz: contest.1
+ 	gzip -c contest.1 > contest.1.gz
+ install: contest contest.1.gz
diff --git a/app-benchmarks/contest/files/contest-fortify_sources.patch b/app-benchmarks/contest/files/contest-fortify_sources.patch
index cb2e6d6dd639..042065822612 100644
--- a/app-benchmarks/contest/files/contest-fortify_sources.patch
+++ b/app-benchmarks/contest/files/contest-fortify_sources.patch
@@ -1,5 +1,5 @@
---- bmark.c	2009-02-27 23:13:44.000000000 +0000
-+++ bmark.c	2009-02-27 23:12:44.000000000 +0000
+--- contest-0.61/bmark.c	2009-02-27 23:13:44.000000000 +0000
++++ contest-0.61/bmark.c	2009-02-27 23:12:44.000000000 +0000
 @@ -47,7 +47,7 @@
  	}
  	/* child */
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index b990924ab528..d48ba771d618 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1 +1 @@
-DIST letsencrypt-0.1.1.tar.gz 533715 SHA256 3f5210fc2e28577b1b24c4fbfb5c20ac259925a5fad81cf69a1b4f62d76511db SHA512 bd045622f77272447b9d497c410a128c30371c6df5beab418089c2c8b26fef9e87ecc6055bdf4017d7d2fb5f840b4900ff9efba848d07a2bf3a1be9d7fc0df99 WHIRLPOOL b89bcbf1dea41bd0a391cc3db86c4a7413cdf9c5e64c2398b60b7c57c5950c221bd64a51f773a7fb2fc725d93f3d672170c97147d5b5b644a008309e95dd8576
+DIST letsencrypt-0.2.0.tar.gz 564016 SHA256 71324323eb6c9fe9a2cee95f012a44e9c7bdc8c9dfe14c26d56129306f188650 SHA512 a00618c0f3ae78cfdb70adfea81ff9d672123fa38585cfda8ed44659be14bd37143f2c5bc076b92d116356437ea08af079142a4ae09a8a6ad06f2793276b973e WHIRLPOOL cd413fd1ca4d2e462bcc573c8b0403010cfc27dca577c56c1465e5d794e7769a0621bac361078762eec12f2296d968421572cb8794cb1a49824b37292dbab572
diff --git a/app-crypt/acme/acme-0.1.1.ebuild b/app-crypt/acme/acme-0.2.0.ebuild
index afd5efce9be0..703410c10135 100644
--- a/app-crypt/acme/acme-0.1.1.ebuild
+++ b/app-crypt/acme/acme-0.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$
 
diff --git a/app-crypt/jacksum/jacksum-1.7.0.ebuild b/app-crypt/jacksum/jacksum-1.7.0.ebuild
index cba79beedac4..df896c6113fd 100644
--- a/app-crypt/jacksum/jacksum-1.7.0.ebuild
+++ b/app-crypt/jacksum/jacksum-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.jonelo.de/java/jacksum/"
 SRC_URI="mirror://sourceforge/jacksum/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND=">=virtual/jdk-1.3.1
 	dev-java/ant-core
diff --git a/app-crypt/letsencrypt/Manifest b/app-crypt/letsencrypt/Manifest
index d4ff231533bf..d48ba771d618 100644
--- a/app-crypt/letsencrypt/Manifest
+++ b/app-crypt/letsencrypt/Manifest
@@ -1,2 +1 @@
-DIST letsencrypt-0.1.1-corrected.tar.gz 533644 SHA256 d9efa11a90cd38bf38218e51c541978ebb836f00ede0c9c8155301ca30a55774 SHA512 26e8b41280a0e9bdbd7324d223c7d72915d2a9149b6a569bad3c17deb01c3426b93b86d4e411865526308e656df5a7d1fb6eaca9fab95600f6ed87def5c30a5a WHIRLPOOL a6aa6f761abd591b4ffdd5d6c071bac31683eedc58ce142389a3a03bd5ab83ef18d8b0f4319d376653de5236f9c66c6721573618b0cba58ad98d2a601d561ed8
-DIST letsencrypt-0.1.1.tar.gz 533715 SHA256 3f5210fc2e28577b1b24c4fbfb5c20ac259925a5fad81cf69a1b4f62d76511db SHA512 bd045622f77272447b9d497c410a128c30371c6df5beab418089c2c8b26fef9e87ecc6055bdf4017d7d2fb5f840b4900ff9efba848d07a2bf3a1be9d7fc0df99 WHIRLPOOL b89bcbf1dea41bd0a391cc3db86c4a7413cdf9c5e64c2398b60b7c57c5950c221bd64a51f773a7fb2fc725d93f3d672170c97147d5b5b644a008309e95dd8576
+DIST letsencrypt-0.2.0.tar.gz 564016 SHA256 71324323eb6c9fe9a2cee95f012a44e9c7bdc8c9dfe14c26d56129306f188650 SHA512 a00618c0f3ae78cfdb70adfea81ff9d672123fa38585cfda8ed44659be14bd37143f2c5bc076b92d116356437ea08af079142a4ae09a8a6ad06f2793276b973e WHIRLPOOL cd413fd1ca4d2e462bcc573c8b0403010cfc27dca577c56c1465e5d794e7769a0621bac361078762eec12f2296d968421572cb8794cb1a49824b37292dbab572
diff --git a/app-crypt/letsencrypt/letsencrypt-0.1.1-r1.ebuild b/app-crypt/letsencrypt/letsencrypt-0.1.1-r1.ebuild
deleted file mode 100644
index 76472f336e9e..000000000000
--- a/app-crypt/letsencrypt/letsencrypt-0.1.1-r1.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
-PYTHON_COMPAT=(python2_7)
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}-corrected.tar.gz -> ${P}-corrected.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/configargparse[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-0.7[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	>=dev-python/psutil-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pythondialog-3.2.2:python-2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${P}-corrected
-
-python_test() {
-	nosetests -w ${PN}/tests || die
-}
diff --git a/app-crypt/letsencrypt/letsencrypt-0.1.1.ebuild b/app-crypt/letsencrypt/letsencrypt-0.2.0.ebuild
index f92eb1c5d7d5..baf81fa53f3c 100644
--- a/app-crypt/letsencrypt/letsencrypt-0.1.1.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-0.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$
 
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/configargparse[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.10.0[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-0.7[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
diff --git a/app-editors/diakonos/metadata.xml b/app-editors/diakonos/metadata.xml
index bfcb6974f1c4..75fa31c009b9 100644
--- a/app-editors/diakonos/metadata.xml
+++ b/app-editors/diakonos/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>maintainer-neededgentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index ab8d6e18f99e..09e8fa8730a8 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,3 +1 @@
-DIST emacs-25.0.50_pre20150523.tar.xz 25311384 SHA256 2dd6e7adb8e3359e00a8cbc15a28ef31b631c8363602e3be7566908f2ee2b047 SHA512 a897c4a4d7bd19c9c9a181b23240aed102295e30f1ba9a167b5c1a3231c05a4613023e6810ca0226cedea6325999a35efb0ea2a2b7e535a0338b7b688592438f WHIRLPOOL ce81ceca640c15437af427cef79090f71c8f19a78c8b2d5966f1887e88fff3bd35c00bcb266fb0d8133ee95b22cac8576f12462fa04c41feebcc7aad2f1ddb7e
-DIST emacs-25.0.50_pre20150731.tar.xz 26825232 SHA256 80127a9d905918066c97df81f3e489dbd30f323e9dec2353d33f124522f91c81 SHA512 9834d191e98e780e8ba8f2fa07b50dda6d380a3e220ad0590bdc160d9e2c9cd3c0b0acd5e8d52f3f0f44070280e3686bd7facd78f9bd4b3f6ce0723f1b3311bf WHIRLPOOL 0c0ec4f99630771da61d5bc80b9001a61fa3b7f49f09b6e9a5dd402a383c4d13717c50d86da9d63ad01dd2fce5ac5d7812bcdcd3e31eefb5f0ad4b00d0cc342f
 DIST emacs-25.0.50_pre20151113.tar.xz 26904832 SHA256 dcfd575afa3123bd63eba12b2ae2c7d1390c8fbccc911e9a4a70028feb207240 SHA512 cc8e871e9bb236ffd99ea93750aabc55401cdfad171f56df81c3127fba41b223196d31a64baf597268805b39015df773587e239192870f70671d131d9c6fc9b8 WHIRLPOOL 9571b10e49c028e4f8a10a54fce10bea16ff9b726e8a266650af180a57a370d225ac3bdffc12828c6d170680e514c9fb1179b3676dd4d4de3e6794147dc935ab
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150523.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150523.ebuild
deleted file mode 100644
index 514a36b1aed4..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150523.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150731.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150731.ebuild
deleted file mode 100644
index 638eb91aa08a..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150731.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
index 4ff688c1f01c..4c02aba0ce3f 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.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 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
index cf19cf76cd1d..3db814a70a8e 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-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$
 
@@ -53,7 +53,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild
index 4ff688c1f01c..4c02aba0ce3f 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.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$
 
@@ -53,7 +53,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 3f611c43b374..b99b34acab99 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -3,7 +3,7 @@ DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a
 DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f
 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
 DIST emacs-23.4-patches-17.tar.xz 16164 SHA256 bc9d4a36239f2749e218d903b67102e211a3a62ef162f5ab2801865dab77b752 SHA512 ceccd559b4f53328d75016b64d246ecf6fca7edebd080ce3bbba5f4d000bec38be5da91f3195c972ede0710da14b3be0545891321259b0a0b2963981c8fd62de WHIRLPOOL 4b70ce4d876e92a006e3dc0a31301f604aa8fa53a198515d1cbb3517a94933b1d7a11636494c1bd28ad1049a5a233d4ec13213e74e1eaff1cf96bb1fd095c345
-DIST emacs-23.4-patches-18.tar.xz 16512 SHA256 8c783691d61b888ca79d5d7a8319806a3125b656b3406a8834166cd53ba94813 SHA512 ec1092ca9a767035517fdb280fa31684466cf03ce19b3bcaf80ea816ad417fe8bf918787c49f2719bbf535a59594132ef2044c38a810717e8b5119a76d3dc0d2 WHIRLPOOL aac96413b3a76acbf3e9a771d909be42f913a72688e5c11c31534439a242e364d220ef66d23b73cf8ed4693f4a9ed2f5642c155e66b4b49e6ea1c2a16944aaa4
+DIST emacs-23.4-patches-19.tar.xz 17684 SHA256 078f5e103af9b9950afefcb8575eefd7b07eb0a241ab67ddb3b8b6d31f657abb SHA512 118d58cd5c8a74b39642bf45920fed25687af2e4a076affe985bf359862950eeba4f2ca99c6482c17c311466fbfaab3f4d583466821da4917fae9bec6e95940a WHIRLPOOL f6fe96f5cb0c2de2a48e6eda2cd26c9c724cd2da661ef4d3e4e4dd14382299615aac4b95bd4e7a21caae74b7630a70d160d65e89f6ac5fa91ad8d9bedaddded4
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc
 DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild
index edb1f0d7de33..742612948662 100644
--- a/app-editors/emacs/emacs-23.4-r14.ebuild
+++ b/app-editors/emacs/emacs-23.4-r14.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 @@ inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-18.tar.xz"
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-19.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
@@ -32,7 +32,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-libs/libXt
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
diff --git a/app-editors/emacs/emacs-24.4-r4.ebuild b/app-editors/emacs/emacs-24.4-r4.ebuild
index 0313d3becc56..bad359703ee5 100644
--- a/app-editors/emacs/emacs-24.4-r4.ebuild
+++ b/app-editors/emacs/emacs-24.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$
 
@@ -38,7 +38,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
diff --git a/app-editors/emacs/emacs-24.5-r1.ebuild b/app-editors/emacs/emacs-24.5-r1.ebuild
index dcda5907b238..c16f16fcd172 100644
--- a/app-editors/emacs/emacs-24.5-r1.ebuild
+++ b/app-editors/emacs/emacs-24.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$
 
@@ -38,7 +38,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
diff --git a/app-editors/emacs/emacs-24.5.ebuild b/app-editors/emacs/emacs-24.5.ebuild
index f5b1d43355f9..11827d266ccc 100644
--- a/app-editors/emacs/emacs-24.5.ebuild
+++ b/app-editors/emacs/emacs-24.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$
 
@@ -38,7 +38,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 49d93a68b841..c93269be0c8a 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,2 +1,3 @@
 DIST gedit-3.16.4.tar.xz 2925984 SHA256 210937ea9143d8a6c9580a7ab11acf60d478f516d591ace6c8384fb085fb4cc0 SHA512 6320e11f6387b317789f6af4bdbb54350af89bd00c1443b26e68afdacf87c672ca74caf50c9ead80f4395a826d07a8da640e5d5ae89f71bccf75da683f420a81 WHIRLPOOL 057a7ecf22d12fa4899d20e3e365000bfe5c39873edc1331a75c1a061a5ce601b69d5ffaec1685cf0751ab0d7feff68e4d8be024654afdf90a6c08d0193aa2e9
 DIST gedit-3.18.2.tar.xz 2915772 SHA256 856e451aec29ee45980011de57cadfe89c3cbc53968f6cc865f8efe0bd0d49b1 SHA512 e81382b74749c4592565bab25d47784a3206e033e6b0e5d5a557403590dafd130e41b31bcecc820a3d9823a48f8e94907bc9bb0335121e369abaca1360a95b30 WHIRLPOOL 87b40323caa707a4ce68d5efc299075883a1fc01e1def15f9052802bccae9075c3aa8c50d36062bb96060421008c510d3c0600fd359950a06ae651e3b56553e5
+DIST gedit-3.18.3.tar.xz 2933132 SHA256 6762ac0d793b0f754a2da5f88739d04fa39daa7491c5c46401d24bcef76c32e7 SHA512 8866bc0958dfcf59e5eac0f3c39f2b5f252ffac78a25551968f539f73ebc25cc792ded93899c066339e9b6927f86d6e5ac583df9b9c4d7f0b07d1cc7683e7eb2 WHIRLPOOL fc60b4d251519057eab978a454a2eb0f6741fd097b58f1ac9614413bdab93e15a5f83132ed14f53ae6a6a49a94e9b78a8acce855d229a8f964fefae044a796e8
diff --git a/app-editors/gedit/gedit-3.18.3.ebuild b/app-editors/gedit/gedit-3.18.3.ebuild
new file mode 100644
index 000000000000..c7b16adada7e
--- /dev/null
+++ b/app-editors/gedit/gedit-3.18.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{3,4,5} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib python-r1 vala virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python spell vala"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+# we need to fix that
+REQUIRED_USE="
+	python? ( introspection )
+	python? ( ^^ ( $(python_gen_useflags '*') ) )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.44:2[dbus]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/gtksourceview-3.18:3.0[introspection?]
+	>=dev-libs/libpeas-1.14.1[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	net-libs/libsoup:2.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+		dev-libs/libpeas[${PYTHON_USEDEP}] )
+	spell? (
+		>=app-text/enchant-1.2:=
+		>=app-text/iso-codes-0.35 )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+	gnome2_src_configure \
+		--disable-deprecations \
+		--enable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
+
+src_install() {
+	local args=()
+	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
+}
diff --git a/app-editors/jedit/jedit-5.0.0.ebuild b/app-editors/jedit/jedit-5.0.0.ebuild
index a1058f9c8c73..c581c70a14ae 100644
--- a/app-editors/jedit/jedit-5.0.0.ebuild
+++ b/app-editors/jedit/jedit-5.0.0.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/app-editors/jedit/jedit-5.2.0.ebuild b/app-editors/jedit/jedit-5.2.0.ebuild
index 71368479a74c..7c87206a5ce5 100644
--- a/app-editors/jedit/jedit-5.2.0.ebuild
+++ b/app-editors/jedit/jedit-5.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/app-emacs/jde/jde-2.4.1.ebuild b/app-emacs/jde/jde-2.4.1.ebuild
index cd992fbebf06..87f2c0e57021 100644
--- a/app-emacs/jde/jde-2.4.1.ebuild
+++ b/app-emacs/jde/jde-2.4.1.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND=">=virtual/jdk-1.3
 	app-emacs/elib
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 824e75830b78..6cf6a29632bf 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -9,3 +9,4 @@ DIST install-crossover-13.2.0.bin 64625581 SHA256 ef29ca8ca275e4fb6b33337aadc2d3
 DIST install-crossover-14.0.3.bin 68080015 SHA256 23f67221e4047b50f3250b29fae51086cce93529956d3885d149d5abddcc83a2 SHA512 86855e112f5b5d7621e0d4c644abe570de0270e678dc9666482025c948733de02c66fcf67999079a8ba99537695b36d4fb61aee90a59c319edad5fb477a0f902 WHIRLPOOL a0f26d06d2bb81063bcf78a474b9bf4732e9314fd886f430c1141bfce26ae09c297ff79087e5834474d87aa772a1f08a44791d24a3a83ff2baf24969885fe9b8
 DIST install-crossover-14.1.4.bin 68463678 SHA256 9e51823fca911916755b1edca8673c69df4c6f3607b170d9b01e9d9143b4d4c7 SHA512 2078d9e8fc10c526085aef0bfa0cedbcc1a96ec59ade934ea10e7f10062f1a58f5647e9aed59653d4a1253699a08e9ef6f01548010e960af24d0d3546549fb91 WHIRLPOOL a9714f15de43acb2ab6fed91bb35ffdec832dc8fef0b9f75ed394ca18af8552b797b795fdc5bc108c7cf27ca432f932b1f4fe6b4d04d4d52dfaa06bfef083aca
 DIST install-crossover-15.0.0.bin 80995834 SHA256 ac538e5568674e23f515b6725bb4cb8b17c516bc910c875d3ac7e45d69f7aff4 SHA512 597262b760c7cfc3c42cdb0b846802c6c47d4fcd5af06b53d0c63c80e4890e14af8ff0eaaac74a08f4f5d55e166a480d199b185efe685f7c42abca3d62fc2a0d WHIRLPOOL 18f5eb531ad32d27e4e2bea1f205593906ab0bcbc022f0963fd237101b26cb796f7f771ab5b7d57b126aea93627390fc55075611551109ad1ad98769a2711951
+DIST install-crossover-15.0.1.bin 81027541 SHA256 ccb222775032711e6d7f3ca5994ebc51cb168cdb9e2599d186b3fb1336ac20fb SHA512 a35188ccebeee8d456e73fdcbb8e8d4f0aff41bb89d92767d2e2e78e7cb25c8e48a150393c1c9abeb9760fbc873314e301c0a364ba27acfe08e0980bb5eedb03 WHIRLPOOL 32396d7be78b6ca975d0eadb753f00c060f731eefee00bd4fbefcf4f96488104f9396632648a14af52976b75bd924325b68c3e7d79da6676bba5207aac5fd045
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
new file mode 100644
index 000000000000..38f3e28206b1
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@@ -0,0 +1,144 @@
+# 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 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
+RESTRICT="bindist test"
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="opt/cxoffice/lib/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	"
+S="${WORKDIR}"
+
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-dialup/capi4k-utils )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	media-libs/alsa-lib[abi_x86_32(-)]
+	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} in ${DISTDIR}"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files
+	rm -r license.txt guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym /opt/cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
+		"${ED}usr/share/applications/"*"CrossOver.desktop"
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	einfo "Source code can be obtained from:"
+	einfo
+	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch
new file mode 100644
index 000000000000..fbc6a0add3d1
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/568246
+
+From 156a2e4dbffa85997636a7a39ef12da6f1b40254 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 14 Dec 2015 09:21:23 +0100
+Subject: [PATCH] ehci: make idt processing more robust
+
+Make ehci_process_itd return an error in case we didn't do any actual
+iso transfer because we've found no active transaction.  That'll avoid
+ehci happily run in circles forever if the guest builds a loop out of
+idts.
+
+This is CVE-2015-8558.
+
+Cc: qemu-stable@nongnu.org
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Tested-by: P J P <ppandit@redhat.com>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ hw/usb/hcd-ehci.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
+index 4e2161b..d07f228 100644
+--- a/hw/usb/hcd-ehci.c
++++ b/hw/usb/hcd-ehci.c
+@@ -1389,7 +1389,7 @@ static int ehci_process_itd(EHCIState *ehci,
+ {
+     USBDevice *dev;
+     USBEndpoint *ep;
+-    uint32_t i, len, pid, dir, devaddr, endp;
++    uint32_t i, len, pid, dir, devaddr, endp, xfers = 0;
+     uint32_t pg, off, ptr1, ptr2, max, mult;
+ 
+     ehci->periodic_sched_active = PERIODIC_ACTIVE;
+@@ -1479,9 +1479,10 @@ static int ehci_process_itd(EHCIState *ehci,
+                 ehci_raise_irq(ehci, USBSTS_INT);
+             }
+             itd->transact[i] &= ~ITD_XACT_ACTIVE;
++            xfers++;
+         }
+     }
+-    return 0;
++    return xfers ? 0 : -1;
+ }
+ 
+ 
+-- 
+2.6.2
+
diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8567.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8567.patch
new file mode 100644
index 000000000000..e1960436a235
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8567.patch
@@ -0,0 +1,95 @@
+https://bugs.gentoo.org/567868
+
+From aa4a3dce1c88ed51b616806b8214b7c8428b7470 Mon Sep 17 00:00:00 2001
+From: P J P <ppandit@redhat.com>
+Date: Tue, 15 Dec 2015 12:27:54 +0530
+Subject: [PATCH] net: vmxnet3: avoid memory leakage in activate_device
+
+Vmxnet3 device emulator does not check if the device is active
+before activating it, also it did not free the transmit & receive
+buffers while deactivating the device, thus resulting in memory
+leakage on the host. This patch fixes both these issues to avoid
+host memory leakage.
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/vmxnet3.c | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
+index a5dd79a..9c1adfc 100644
+--- a/hw/net/vmxnet3.c
++++ b/hw/net/vmxnet3.c
+@@ -1194,8 +1194,13 @@ static void vmxnet3_reset_mac(VMXNET3State *s)
+ 
+ static void vmxnet3_deactivate_device(VMXNET3State *s)
+ {
+-    VMW_CBPRN("Deactivating vmxnet3...");
+-    s->device_active = false;
++    if (s->device_active) {
++        VMW_CBPRN("Deactivating vmxnet3...");
++        vmxnet_tx_pkt_reset(s->tx_pkt);
++        vmxnet_tx_pkt_uninit(s->tx_pkt);
++        vmxnet_rx_pkt_uninit(s->rx_pkt);
++        s->device_active = false;
++    }
+ }
+ 
+ static void vmxnet3_reset(VMXNET3State *s)
+@@ -1204,7 +1209,6 @@ static void vmxnet3_reset(VMXNET3State *s)
+ 
+     vmxnet3_deactivate_device(s);
+     vmxnet3_reset_interrupt_states(s);
+-    vmxnet_tx_pkt_reset(s->tx_pkt);
+     s->drv_shmem = 0;
+     s->tx_sop = true;
+     s->skip_current_tx_pkt = false;
+@@ -1431,6 +1435,12 @@ static void vmxnet3_activate_device(VMXNET3State *s)
+         return;
+     }
+ 
++    /* Verify if device is active */
++    if (s->device_active) {
++        VMW_CFPRN("Vmxnet3 device is active");
++        return;
++    }
++
+     vmxnet3_adjust_by_guest_type(s);
+     vmxnet3_update_features(s);
+     vmxnet3_update_pm_state(s);
+@@ -1627,7 +1637,7 @@ static void vmxnet3_handle_command(VMXNET3State *s, uint64_t cmd)
+         break;
+ 
+     case VMXNET3_CMD_QUIESCE_DEV:
+-        VMW_CBPRN("Set: VMXNET3_CMD_QUIESCE_DEV - pause the device");
++        VMW_CBPRN("Set: VMXNET3_CMD_QUIESCE_DEV - deactivate the device");
+         vmxnet3_deactivate_device(s);
+         break;
+ 
+@@ -1741,7 +1751,7 @@ vmxnet3_io_bar1_write(void *opaque,
+          * shared address only after we get the high part
+          */
+         if (val == 0) {
+-            s->device_active = false;
++            vmxnet3_deactivate_device(s);
+         }
+         s->temp_shared_guest_driver_memory = val;
+         s->drv_shmem = 0;
+@@ -2021,9 +2031,7 @@ static bool vmxnet3_peer_has_vnet_hdr(VMXNET3State *s)
+ static void vmxnet3_net_uninit(VMXNET3State *s)
+ {
+     g_free(s->mcast_list);
+-    vmxnet_tx_pkt_reset(s->tx_pkt);
+-    vmxnet_tx_pkt_uninit(s->tx_pkt);
+-    vmxnet_rx_pkt_uninit(s->rx_pkt);
++    vmxnet3_deactivate_device(s);
+     qemu_del_nic(s->nic);
+ }
+ 
+-- 
+2.6.2
+
diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8701.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8701.patch
new file mode 100644
index 000000000000..0dab1c3eefd1
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8701.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/570110
+
+From 007cd223de527b5f41278f2d886c1a4beb3e67aa Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Mon, 28 Dec 2015 16:24:08 +0530
+Subject: [PATCH] net: rocker: fix an incorrect array bounds check
+
+While processing transmit(tx) descriptors in 'tx_consume' routine
+the switch emulator suffers from an off-by-one error, if a
+descriptor was to have more than allowed(ROCKER_TX_FRAGS_MAX=16)
+fragments. Fix an incorrect bounds check to avoid it.
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/rocker/rocker.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
+index c57f1a6..2e77e50 100644
+--- a/hw/net/rocker/rocker.c
++++ b/hw/net/rocker/rocker.c
+@@ -232,6 +232,9 @@ static int tx_consume(Rocker *r, DescInfo *info)
+         frag_addr = rocker_tlv_get_le64(tlvs[ROCKER_TLV_TX_FRAG_ATTR_ADDR]);
+         frag_len = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_FRAG_ATTR_LEN]);
+ 
++        if (iovcnt >= ROCKER_TX_FRAGS_MAX) {
++            goto err_too_many_frags;
++        }
+         iov[iovcnt].iov_len = frag_len;
+         iov[iovcnt].iov_base = g_malloc(frag_len);
+         if (!iov[iovcnt].iov_base) {
+@@ -244,10 +247,7 @@ static int tx_consume(Rocker *r, DescInfo *info)
+             err = -ROCKER_ENXIO;
+             goto err_bad_io;
+         }
+-
+-        if (++iovcnt > ROCKER_TX_FRAGS_MAX) {
+-            goto err_too_many_frags;
+-        }
++        iovcnt++;
+     }
+ 
+     if (iovcnt) {
+-- 
+2.6.2
+
diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8743.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8743.patch
new file mode 100644
index 000000000000..b2bca5692730
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8743.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/570988
+
+From aa7f9966dfdff500bbbf1956d9e115b1fa8987a6 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Thu, 31 Dec 2015 17:05:27 +0530
+Subject: [PATCH] net: ne2000: fix bounds check in ioport operations
+
+While doing ioport r/w operations, ne2000 device emulation suffers
+from OOB r/w errors. Update respective array bounds check to avoid
+OOB access.
+
+Reported-by: Ling Liu <liuling-it@360.cn>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/ne2000.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
+index 010f9ef..a3dffff 100644
+--- a/hw/net/ne2000.c
++++ b/hw/net/ne2000.c
+@@ -467,8 +467,9 @@ static inline void ne2000_mem_writel(NE2000State *s, uint32_t addr,
+                                      uint32_t val)
+ {
+     addr &= ~1; /* XXX: check exact behaviour if not even */
+-    if (addr < 32 ||
+-        (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) {
++    if (addr < 32
++        || (addr >= NE2000_PMEM_START
++            && addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) {
+         stl_le_p(s->mem + addr, val);
+     }
+ }
+@@ -497,8 +498,9 @@ static inline uint32_t ne2000_mem_readw(NE2000State *s, uint32_t addr)
+ static inline uint32_t ne2000_mem_readl(NE2000State *s, uint32_t addr)
+ {
+     addr &= ~1; /* XXX: check exact behaviour if not even */
+-    if (addr < 32 ||
+-        (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) {
++    if (addr < 32
++        || (addr >= NE2000_PMEM_START
++            && addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) {
+         return ldl_le_p(s->mem + addr);
+     } else {
+         return 0xffffffff;
+-- 
+2.6.2
+
diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-1568.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-1568.patch
new file mode 100644
index 000000000000..4ce9a35c3f11
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-1568.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/571566
+
+From 4ab0359a8ae182a7ac5c99609667273167703fab Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Mon, 11 Jan 2016 14:10:42 -0500
+Subject: [PATCH] ide: ahci: reset ncq object to unused on error
+
+When processing NCQ commands, AHCI device emulation prepares a
+NCQ transfer object; To which an aio control block(aiocb) object
+is assigned in 'execute_ncq_command'. In case, when the NCQ
+command is invalid, the 'aiocb' object is not assigned, and NCQ
+transfer object is left as 'used'. This leads to a use after
+free kind of error in 'bdrv_aio_cancel_async' via 'ahci_reset_port'.
+Reset NCQ transfer object to 'unused' to avoid it.
+
+[Maintainer edit: s/ACHI/AHCI/ in the commit message. --js]
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: 1452282511-4116-1-git-send-email-ppandit@redhat.com
+Signed-off-by: John Snow <jsnow@redhat.com>
+---
+ hw/ide/ahci.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
+index dd1912e..17f1cbd 100644
+--- a/hw/ide/ahci.c
++++ b/hw/ide/ahci.c
+@@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *ncq_tfs)
+     ide_state->error = ABRT_ERR;
+     ide_state->status = READY_STAT | ERR_STAT;
+     ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);
++    ncq_tfs->used = 0;
+ }
+ 
+ static void ncq_finish(NCQTransferState *ncq_tfs)
+-- 
+2.6.2
+
diff --git a/app-emulation/qemu/qemu-2.5.0-r1.ebuild b/app-emulation/qemu/qemu-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..9f61eb31b458
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.5.0-r1.ebuild
@@ -0,0 +1,657 @@
+# 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
+
+	epatch "${FILESDIR}"/${P}-CVE-2015-8567.patch #567868
+	epatch "${FILESDIR}"/${P}-CVE-2015-8558.patch #568246
+	epatch "${FILESDIR}"/${P}-CVE-2015-8701.patch #570110
+	epatch "${FILESDIR}"/${P}-CVE-2015-8743.patch #570988
+	epatch "${FILESDIR}"/${P}-CVE-2016-1568.patch #571566
+
+	# 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-eselect/eselect-java/eselect-java-0.1.0-r1.ebuild b/app-eselect/eselect-java/eselect-java-0.1.0-r1.ebuild
index 182efd021fa7..585b6803a1b1 100644
--- a/app-eselect/eselect-java/eselect-java-0.1.0-r1.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.1.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$
 
@@ -12,7 +12,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-eselect/eselect-java/eselect-java-0.1.0.ebuild b/app-eselect/eselect-java/eselect-java-0.1.0.ebuild
index 90afab74379f..439917aa7a6e 100644
--- a/app-eselect/eselect-java/eselect-java-0.1.0.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.1.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$
 
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-eselect/eselect-java/eselect-java-0.2.0.ebuild b/app-eselect/eselect-java/eselect-java-0.2.0.ebuild
index a86b5345d814..b5e76290a75c 100644
--- a/app-eselect/eselect-java/eselect-java-0.2.0.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r1.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r1.ebuild
index ef81178c8d36..a3387474adf9 100644
--- a/app-eselect/eselect-maven/eselect-maven-0.2-r1.ebuild
+++ b/app-eselect/eselect-maven/eselect-maven-0.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$
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.8
diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r2.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r2.ebuild
index 1e74afe7cc3b..e3d3e53bc2ff 100644
--- a/app-eselect/eselect-maven/eselect-maven-0.2-r2.ebuild
+++ b/app-eselect/eselect-maven/eselect-maven-0.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$
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.8
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild
deleted file mode 100644
index ff6a98fbf6c7..000000000000
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-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$
-
-EAPI="1"
-
-inherit autotools eutils gnome2-utils multilib
-
-DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib
-	x11-libs/pango
-	>=x11-libs/gtk+-2.4:2
-	>=app-i18n/freewnn-1.1.1_alpha21-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-wnnrc-gentoo.diff"
-	# bug #298744
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${P}-implicit-declaration.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
index 3222ccb423e0..1c905af691ee 100644
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-i18n/man-pages-de/metadata.xml b/app-i18n/man-pages-de/metadata.xml
index 90686b854c06..eb83bf818203 100644
--- a/app-i18n/man-pages-de/metadata.xml
+++ b/app-i18n/man-pages-de/metadata.xml
@@ -7,9 +7,4 @@
 		<name>Markus Oehme</name>
 		<description>Assign bugs to him</description>
 	</maintainer>
-	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
index 21cb1b0293ff..fba7d73699e2 100644
--- a/app-misc/abduco/Manifest
+++ b/app-misc/abduco/Manifest
@@ -1,2 +1,2 @@
-DIST abduco-0.3.tar.gz 11978 SHA256 934bf0b9ae25fb3f71b775387b5f281bf7d175fea79c12ec28ffdbbbb95390d4 SHA512 0bbd3a52e256738d39edf8e73e43d72fd4bcf2d240f45b8287486910777310320e239e7d1abb523a37c573dc557a0e33bf5849aa34f50f261f50c27a80db7338 WHIRLPOOL 1741f3c8d47a4f745b0fa0bed79306ca2d7dba8a936c6e66c1773205809fa1cf12f33f4c9f488eaa3c31f57d21299f17ec092926539a4fd037ebf2619e0dfb85
 DIST abduco-0.4.tar.gz 14222 SHA256 bda3729df116ce41f9a087188d71d934da2693ffb1ebcf33b803055eb478bcbb SHA512 1f6df3604f5b4b59a650ccb8b6b7f9e62591154f72163350b8c8d2ffa9c392c9ebda0f958537a203e87319e275674fec6d161f18a10d49e44d0afc512c467f88 WHIRLPOOL e232bbae99cdd0c3c5b0e06f8cce73126586f9d997a03ba03720030355d603ee488df40b04343b6bfd508d2ac05dbdd2ca3bc6a62a661b140c5bd9bfc43fde12
+DIST abduco-0.5.tar.gz 15790 SHA256 bf22226a4488355a7001a5dabbd1e8e3b7e7645efd1519274b956fcb8bcff086 SHA512 e0772b8eecc1fb6f16c7516a6956825b9bda4149f00f56b34e68ec3544f74c2270ba8cc2642599de26ae34d11ed78b8bba70497bfc9a79f3008f50de02ce49d8 WHIRLPOOL ffce64702323cba434768bb4864b9f8bd0e5a6768f3fd5a821081eee77dcffea33c8ab920e39471fb644ca2ff03214d04808d55804889a278417c5d6d76d3f79
diff --git a/app-misc/abduco/abduco-0.3.ebuild b/app-misc/abduco/abduco-0.5.ebuild
index 8dcc0276128e..250644235c88 100644
--- a/app-misc/abduco/abduco-0.3.ebuild
+++ b/app-misc/abduco/abduco-0.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$
 
@@ -43,7 +43,7 @@ src_test() {
 
 src_install() {
 	dobin ${PN}
-	dodoc README
+	dodoc README.md
 	doman ${PN}.1
 
 	save_config config.def.h
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index c53a99fe9e47..c15cc68a2817 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
-DIST carbon-c-relay-0.44.tar.gz 54533 SHA256 424f5eebdfcd8cd42f07495b97c440e9133723966013d63fe3f6d8220bd031dc SHA512 ae0ded77d189c22bab0400922831211f411d47b92bde44f9a4c4208a094a57ac875a52e04ef6297238281bb44c8869f0510b3a3b6dc1c564e02e4f22bb69e268 WHIRLPOOL b7351576d7f1bdb5c0929967faacd6861a10f8d8d3bedebcc9bf7a3f15e0b9ea2d3475ecd8e700e3f2fb190698ea343fcb4530d10522591512f1de9d787a0ab2
 DIST carbon-c-relay-0.45.tar.gz 63208 SHA256 ba76d93d0448eae64147d580c2767ed42a8a9dd4a6c0f3e15a41276793bc53df SHA512 7a5068a6a1502c80b03c642abb72639de644351edc2967736c6f40939a6e28598727ad7bec9008eb76c3211552d6583f0ec9670e7c32952c0f49f6b4cb9a6085 WHIRLPOOL 089a9a6c3fb40e1bfc680b7002bf9967c4a182ae00616933cd5b3ba9febda20853e716df69d552ade131aa272cd16dafb65d1ba84afeacb4383d87f9e028bf97
 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
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-0.44.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-1.5.ebuild
index e20b1c5dec80..263b0462af5b 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-0.44.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-1.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$
 
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index ee2f773a943a..8c459a7c67e0 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,2 +1,2 @@
-DIST ckb-0.2.1.tar.gz 430544 SHA256 0a44c72ad56cd9c0ee939cafea736b396c7ea72a24466fa0bee1beb4c8100496 SHA512 d8527cb2efc0be4d8bfe5f8ce95faa9c4bb2e7d2a85301591ea170f68cd6e58479ee49ac2de29ae80c8365137c31f78e83c13bc0c6d0a1659d702cfc740125fb WHIRLPOOL a036431118c15515825327b841b864741cdee9f1ec409af06750d82f65e2b8eb02425809a568f41752a943ffb6d729aa2bca143dd522cc867def9189997ea543
 DIST ckb-0.2.2.tar.gz 513180 SHA256 bb916af087fb6fd9f9955c79edc899c6343b12c9db576d6adbd6c608b22e9f7b SHA512 0f6236f922330b497c1297e0fec609400e1c7723937fe4e58702b62647068cc8271bbdd95c424d70debdbe81b843af22c09c9ce4a178f9b9796794b287847cfc WHIRLPOOL c65fb7b01eeef73ad6d2bc0755955af5e5a68f3797e5d737aca058a37744c166106c242081d89ac041743e45cb5f5c305a455ca439b9986b8e0e1a8a97c150f5
+DIST ckb-0.2.3.tar.gz 520320 SHA256 ee5ef3470444d422451a3e84b164723f54d697be8a6f86e31d7a6554c7cf0dc4 SHA512 7fd369b61c66f169445f88202fcb5a1cc73e12448ccb1da0d1849c39f0c779e0835039ede0eb1dd458d73a0660b1d526d97f629c5a716393eb54596bdbe637e4 WHIRLPOOL 45305b3846a17bf88d8051f62a2ab89639ab23fcf41decd90b3a935f4357028f8585911a39fdd076c7cc5f4c0bbb0b8247c17636553ebb83c9d5c322d919145d
diff --git a/app-misc/ckb/ckb-0.2.1.ebuild b/app-misc/ckb/ckb-0.2.3.ebuild
index 8c4a97a52f90..a17723e11dbf 100644
--- a/app-misc/ckb/ckb-0.2.1.ebuild
+++ b/app-misc/ckb/ckb-0.2.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$
 
diff --git a/app-misc/ddccontrol-db/metadata.xml b/app-misc/ddccontrol-db/metadata.xml
index b4e15d502d9d..30e9b3a48517 100644
--- a/app-misc/ddccontrol-db/metadata.xml
+++ b/app-misc/ddccontrol-db/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>mrueg@gentoo.org</email>
-    <name>Manuel Rüger</name>
+    <email>maintainer-needed@gentoo.org</email>
   </maintainer>
   <upstream>
     <remote-id type="github">ddccontrol/ddccontrol-db</remote-id>
diff --git a/app-misc/ddccontrol/metadata.xml b/app-misc/ddccontrol/metadata.xml
index b6fbde4eda1f..fbe3ac7dfb60 100644
--- a/app-misc/ddccontrol/metadata.xml
+++ b/app-misc/ddccontrol/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>mrueg@gentoo.org</email>
-    <name>Manuel Rüger</name>
+    <email>maintainer-needed@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="pci">enable direct PCI memory access (the setuid ddcpci util)</flag>
diff --git a/app-misc/hello/Manifest b/app-misc/hello/Manifest
index 031bfa8bce06..b9969e226105 100644
--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@@ -1,2 +1,3 @@
+DIST hello-2.10.tar.gz 725946 SHA256 31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de WHIRLPOOL cd2e1c42ac74e059cbc6e236a389f66569bf5895c652f7917453a8e02b1cbd25319de8fbc4b2288fe01b551cf4199442b3be1f304c6ab0c1e1e5195251fecab4
 DIST hello-2.8.tar.gz 697483 SHA256 e6b77f81f7cf7daefad4a9f5b65de6cae9c3f13b8cfbaea8cb53bb5ea5460d73 SHA512 87fdd330fccc7d42c76df9902e21184e7976e4eb95f43dd30417030170471c34be68c37958acb6e4d3ac5f2ed7f6897730388bb6d38f5b0c06202cb8ffccb6e7 WHIRLPOOL 33f8043d8915a3ca6ce7569d2559df990d9abe17f89773230506b7ef480444fec417bbe0073c8d97d85187069b294ed4233faf81933d57c65707ab7648184b9d
 DIST hello-2.9.tar.gz 723645 SHA256 ecbb7a2214196c57ff9340aa71458e1559abd38f6d8d169666846935df191ea7 SHA512 b2be91f436d8ebbf431af7f2bb9b61453cfcd336e2745971be48c2c94d7b6ea615e05ef0526fc25f235377d3f7073e1c432c0d522891a8978252267a61aeec86 WHIRLPOOL daf3efa4571bda38f22f4cabb8707ddba883e39a097171013093fe70aa36385032331336f785a1788f51a7b7ab331c11093d88d3028893d2034aaf84eca51ef4
diff --git a/app-misc/hello/hello-2.10.ebuild b/app-misc/hello/hello-2.10.ebuild
new file mode 100644
index 000000000000..83b1e29d72b6
--- /dev/null
+++ b/app-misc/hello/hello-2.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="GNU \"Hello, world\" application"
+HOMEPAGE="https://www.gnu.org/software/hello/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog ChangeLog.O NEWS README THANKS TODO contrib/evolution.txt)
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-misc/jitac/jitac-0.3.0.ebuild b/app-misc/jitac/jitac-0.3.0.ebuild
index 1f3427746dbe..d0447f5a3e42 100644
--- a/app-misc/jitac/jitac-0.3.0.ebuild
+++ b/app-misc/jitac/jitac-0.3.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.roqe.org/jitac/${P}.src.jar"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 COMMON_DEP="
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 6780eab83df9..d7d3e374ccfc 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,3 +1,4 @@
 DIST screenfetch-2.7.7.zip 41420 SHA256 c50322375929c78b13afc5fd4e62259087db3988283109ddcf60e98194f3adc8 SHA512 b783c05fc385d176e8d4e06c647c86ceef0ec465ddaa7ceab4116dc844e6a3a4cb10a706aef62ed4c0e1893942be4761dc1962e99d45b528742372415bd17b10 WHIRLPOOL ab863a39d5610ca86302cdbedbb83c4a4da6909093c0a6b7e43d92c1a5f1bf86a34f2ce316ab6168fa6097d478b4838160758a8ce0de9c0404ed538461f868c3
 DIST screenfetch-3.2.2.tar.gz 46668 SHA256 6f30cc06b1f19cbeffc211afdf4c754c1e77b5e35965240ea77b032bb2e32bd4 SHA512 f8ddfcebe69919c9163c2377de8dfb28f15c9dd59c43d73245591b2ba6c41123c6c8130b673d87e6068850fca3b277f93bbb626e228266ea0c87be5856e823da WHIRLPOOL 7514eafaa7fb1df51a8beb5720f771217b32b902ca4e4433cfbe0f058dc11ccd82529b7622a1686878ad2e983063cfeaed0c9302b47f335a1dc4e5cb628568e4
 DIST screenfetch-3.6.5.tar.gz 54153 SHA256 b6605a94be9720a5e64778dcc43ddf23e435d6704c5d177b671aa57d34966f20 SHA512 291ec0d313deebe7931b739578b69f590ae32cb7a59c5ae6975b25240d9c5bd92b8957d6a53baf78aa95737642eadd37e081fae5b5ca5120da5a9d76bb980c59 WHIRLPOOL 33b8be75c98e09adde332792b10ff1aa808d6ed5d170aaeb9ee8eaa25925119b82a49902d39d810ae908fc65a864d5b7b6cbe9ce956054b08a8eda96e3ac4ab3
+DIST screenfetch-3.7.0.tar.gz 60223 SHA256 6711fe924833919d53c1dfbbb43f3777d33e20357a1b1536c4472f6a1b3c6be0 SHA512 9a6e89ef2cd48f12b22230c7aff356ac2ece8dc7437034a51a66f8026e5ca4a630af43511a60b21e9fc9f89af9e2493b8cfa3a06294e74c3d611ae3bb0db922d WHIRLPOOL 3db52291ceef4403742f06644e1a6fc1a36a95aec9f1c3cc730676d8b731eedb9fe4efc6fd81b6701d3e26039c6783bea684cea8c14ed73bf218c04d90db4ff0
diff --git a/app-misc/screenfetch/screenfetch-3.7.0.ebuild b/app-misc/screenfetch/screenfetch-3.7.0.ebuild
new file mode 100644
index 000000000000..dc0378bd3c29
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-3.7.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 eutils
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	newbin ${PN}-dev ${PN}
+	dodoc CHANGELOG README.mkdn TODO
+}
+
+pkg_postinst() {
+	optfeature "resoluton detection" x11-apps/xdpyinfo
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+}
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 8157a0064ac4..615fa7e5ff88 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,31 +1,29 @@
-# 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 eutils git-r3
 
 MY_PN="${PN/f/F}"
-DESCRIPTION="A Bash Screenshot Information Tool"
+
+DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> \
-		${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
+EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS=""
 IUSE="X"
 
-DEPEND=""
-RDEPEND="X? ( media-gfx/scrot x11-apps/xdpyinfo )"
-
 src_install() {
 	newbin ${PN}-dev ${PN}
 	dodoc CHANGELOG README.mkdn TODO
 }
+
+pkg_postinst() {
+	optfeature "resoluton detection" x11-apps/xdpyinfo
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+}
diff --git a/app-office/borg/borg-1.7.4-r3.ebuild b/app-office/borg/borg-1.7.4-r3.ebuild
index c1131283e3b8..cd51616902bb 100644
--- a/app-office/borg/borg-1.7.4-r3.ebuild
+++ b/app-office/borg/borg-1.7.4-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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/borg-calendar/borg%201.7/BORG%20${PV}/${MY_PN}_${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index c969e1e0b843..73d753466182 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,2 +1 @@
-DIST magicpoint-1.13a.tar.gz 890670 SHA256 205e6752e3cb024bcce0583b43dafc9b89490c0016daa91d2486891edcf2cfc1 SHA512 c2399826d770f6307128eb1a88593404d5b495203319e0c90edf36e91ce82e2e42b1777cbf473f52376aa4645468ac65920839f94b58d7c9d90f08a961273df9 WHIRLPOOL ed40897f528bd70ef785f5f0c2f5a0b55ad6f14fe9fbc65849b8713d7fa84590d5f668f008d8b0b737db7e95373f5865a85446489ea0790d6e8e206f30bb7d72
 DIST mgp-snap-20121015.tar.gz 886902 SHA256 21134551d492995b0e6d9a20ecb1f2c1afdbbaef4f529ca6be59a80581c18ac2 SHA512 fa59b1ec04e2e191b74c25fd3ae9b4c855ad96d23e9e5b071c959f56b9d2064d7bdf9217b5c62c5733cc2d9ec17981947febd7afb2552f1145262225909cc711 WHIRLPOOL 6d2086df981a0b67b1bbbf85284e6b7d808f09d0884388fdf83ac69917e7a01440bda34753f6c9f45bbd39640c28ab73509ff4f1ebfcc54f83931ef6a13b568e
diff --git a/app-office/magicpoint/magicpoint-1.13a.ebuild b/app-office/magicpoint/magicpoint-1.13a.ebuild
deleted file mode 100644
index 6f97fc02d737..000000000000
--- a/app-office/magicpoint/magicpoint-1.13a.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools elisp-common eutils fixheadtails toolchain-funcs
-
-DESCRIPTION="An X11 based presentation tool"
-SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/${P}.tar.gz
-	ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
-HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~sparc x86"
-IUSE="cjk doc emacs examples gif imlib m17n-lib mng nls truetype"
-
-MY_DEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXmu
-	>=media-libs/libpng-1.4
-	gif? ( >=media-libs/giflib-4.0.1 )
-	imlib? ( media-libs/imlib )
-	truetype? ( x11-libs/libXft )
-	emacs? ( virtual/emacs )
-	m17n-lib? ( dev-libs/m17n-lib )
-	mng? ( media-libs/libmng )"
-DEPEND="${MY_DEPEND}
-	sys-devel/autoconf
-	x11-proto/xextproto
-	x11-libs/libxkbfile
-	app-text/rman
-	x11-misc/imake"
-RDEPEND="${MY_DEPEND}
-	nls? ( sys-devel/gettext )
-	truetype? ( cjk? ( media-fonts/sazanami ) )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.11b-gentoo.diff \
-		"${FILESDIR}"/${P}-implicit-declaration.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	# fix compability with libpng14
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		configure.in image/png.c || die
-
-	# bug #85720
-	sed -i -e "s/ungif/gif/g" configure.in || die
-	ht_fix_file configure.in
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gif) \
-		$(use_enable imlib) \
-		$(use_enable nls locale) \
-		$(use_enable truetype xft2) \
-		$(use_with m17n-lib) \
-		--disable-vflib \
-		--disable-freetype \
-		--x-libraries=/usr/lib/X11 \
-		--x-includes=/usr/include/X11
-}
-
-src_compile() {
-	xmkmf || die
-	# no parallel build possibly, anywhere
-	emake -j1 Makefiles
-	emake -j1 clean
-	tc-export CC
-	emake -j1 CC="${CC}" CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" \
-		BINDIR=/usr/bin LIBDIR=/etc/X11
-	if use emacs; then
-	   cd contrib/
-	   elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		BINDIR=/usr/bin \
-		LIBDIR=/etc/X11 \
-		install
-
-	emake -j1 \
-		DESTDIR="${D}" \
-		DOCHTMLDIR=/usr/share/doc/${PF} \
-		MANPATH=/usr/share/man \
-		MANSUFFIX=1 \
-		install.man
-
-	dobin contrib/{mgp2html.pl,mgp2latex.pl}
-
-	if use emacs; then
-		cd contrib/
-		elisp-install ${PN} *.el *.elc || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		cd -
-	fi
-
-	use doc && dodoc FAQ README* RELNOTES SYNTAX TODO* USAGE*
-
-	if use examples; then
-		cd sample
-		insinto /usr/share/${PF}/sample
-		doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \
-			mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \
-			multilingual.mgp sample*.mgp sendmail6*.mgp \
-			tutorial*.mgp v6*.mgp v6header.*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "If you enabled xft2 support (default) you may specify xfont directive by"
-	elog "font name and font registry."
-	elog "e.g.)"
-	elog '%deffont "standard" xfont "sazanami mincho" "jisx0208.1983"'
-	elog
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index 27c99c2a9587..2a9e9032dca2 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/texstudio/Manifest b/app-office/texstudio/Manifest
index 4486699daa64..25a51b1912ea 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,2 +1,3 @@
 DIST texstudio-2.10.2.tar.gz 25669897 SHA256 0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c WHIRLPOOL e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607
 DIST texstudio-2.10.4.tar.gz 25810583 SHA256 87e7b7c52d51791178fac4c48feeded7a920bc39bcfb710a745b467d80111c3c SHA512 13c6624bf38ee2633f9a86eb9c7ba03503b63de1f954c3f7c4a24182127b9d4db1e8524a122552412a2ceccb288a0dad3d70e9368fd897d6ec123a16e37816e5 WHIRLPOOL 357796f638d3e558a9560a62d972555474850ebd6b5a61bdaa14037b728113222ce9c9f2438b851fdaa20687e1444a8913cd222d5849de67293b0589085a6dc9
+DIST texstudio-2.10.6.tar.gz 25956475 SHA256 16368d7334f809aebe7a656f9bfa97f0ececb09d437fdb35ae7fc1888f1525e1 SHA512 061bad8530503aa611a09e5e2013fb5e956f436de00e2cd773fbd5e76c7a198fc9a628e4785e45f63dae5a2d0fed3e7f88d4a1a4a1f6fd0babdc44cc51eee0ab WHIRLPOOL 42d34dcae31f941b4d43af948e91a00be34d002bc85476f12e8e38b83d518f439b012c0c53aeb22728de984a55d2ee6a9139ff96c4aa1fe993059c935727a780
diff --git a/app-office/texstudio/files/texstudio-2.10.6-desktop.patch b/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
new file mode 100644
index 000000000000..ab2822f6b2d6
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
@@ -0,0 +1,18 @@
+--- utilities/texstudio.desktop.old	2016-01-17 16:38:44.283878626 +0100
++++ utilities/texstudio.desktop	2016-01-17 16:39:08.374876711 +0100
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
+-Encoding=UTF-8
+ Exec=texstudio %F
+ GenericName=LaTeX Editor
+ GenericName[fr]=Editeur LaTeX
+@@ -8,7 +7,7 @@
+ Comment[fr]=Environnement de développement LaTeX
+ Icon=texstudio
+ Keywords=LaTeX;TeX;editor;
+-MimeType=text/x-tex;
++MimeType=text/X-tex;
+ Name=TeXstudio
+ StartupNotify=false
+ Terminal=false
diff --git a/app-office/texstudio/texstudio-2.10.6.ebuild b/app-office/texstudio/texstudio-2.10.6.ebuild
new file mode 100644
index 000000000000..668b92ade92f
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.10.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime prefix qmake-utils
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="http://texstudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video qt4 +qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4?,qt5?]
+	>=dev-libs/quazip-0.7.1[qt4?,qt5?]
+	dev-qt/qtsingleapplication[X,qt4?,qt5?]
+	x11-libs/libX11
+	x11-libs/libXext
+	qt4? (
+		dev-qt/designer:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtcore-4.6.1:4
+		>=dev-qt/qtscript-4.6.1:4
+		>=dev-qt/qtsvg-4.6.1:4
+		>=dev-qt/qttest-4.6.1:4
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsvg:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	video? ( media-libs/phonon[qt4?,qt5?] )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/-/}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch
+	"${FILESDIR}"/${PN}-2.10.6-desktop.patch
+	)
+
+src_prepare() {
+	find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/hunspell.pri/d' \
+		-e '/quazip.pri/d' \
+		-e '/qtsingleapplication.pri/d' \
+		-e '/QUAZIP_STATIC/d' \
+		-i ${PN}.pro || die
+
+#	cat >> ${PN}.pro <<- EOF
+#	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+#	EOF
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+
+	epatch ${PATCHES[@]}
+}
+
+src_configure() {
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		insinto /usr/share/icons/hicolor/${i}
+		newins utilities/${PN}${i}.png ${PN}.png
+	done
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index c2c868ad6b57..6213619ec425 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,4 @@
 DIST wps-office_10.1.0.5444~a20_amd64.deb 81954904 SHA256 19380705962fb6f161dbf2ba40c6a5b5df34dc55b983ac6b1bd1776baeef2069 SHA512 585bcf5f51c7fec073fdc284501e4f31199f5982badaf879b325b6e49b5e0d4c3eb0d719ce6b5ee180aed8b479531e8f060d036902a4efbe6c632bb0146e6eb3 WHIRLPOOL 246fb53eb3122966be033c0bcc20035b86fbd0b8f1a327fa21bbd27ffef14738c61f23d00431e5b7ab93fc95d759e6bc269c128de66ad45488d363f2e3d63d30
 DIST wps-office_10.1.0.5444~a20_i386.deb 81553560 SHA256 130ac0926ae2c8bc4dc3b3092998556b5d949044d7630cc4d41b5339e6e487f5 SHA512 02474a9948b1e2907a84522cb7d84a4acbda5bfdd5aa97068b60acf92646ef89858ee1eb5e834be7caa2eeb8c8e3eb33b5fd691d15711e5daf205611dfac0363 WHIRLPOOL 8d06d473ae042497173b68bedc3d776c1f3b133428035410c14d24ea12e0a340ab47a1362f60eb6b1113ab48a2bfb9aac55031a878f6097f644477b751130b73
-DIST wps-office_9.1.0.4975~a19p1_amd64.deb 64716800 SHA256 79a49c9db0c4482c894e3c334e38bd299302e1c4bb4cd387f6a615f9e054a25d SHA512 f92415eb8d652afa6601dbea8f87949ed05d970e610c5aedebda21f2b0386a80bcea164f86e7c680946302d2f953067fc88889891a346353e4f15b547ecb8a3a WHIRLPOOL b8603756e4d3b09691974966d62f80dbe1ec668ae2eb5d99bbe2ad39a6c944de89292ede651143d894fad2631f7686036cd4a281ed5265a09f1af6361d75ea77
-DIST wps-office_9.1.0.4975~a19p1_i386.deb 66646188 SHA256 5b843cfc44d062a6b9c8e3b57ca55ffff5bc76dba7d03bc489275ebda4388122 SHA512 79e7ef4b3a7e906aa1811f5caa9bc056994e64c3abbf4ed9b1866d3d935235a092a55623ee4efe2de9a42b8ffe4737deba9cbc24ca187229a82adc05f30ab238 WHIRLPOOL 44f9e4f170decc923f47996683a070d32c10fee78b586c7fc160d5d7173c4197abe5384f78cad5b35349199dd2a81a4de7793299f16d708f0703182bad6e1264
+DIST wps-office_10.1.0.5460~a20p1_amd64.deb 81891888 SHA256 5e4844a0da411f2ff01d3b1dd03ff7291799001ee7a78925d8c5dd3ca3fce8d0 SHA512 ae3ff4923177f6fa8e097099045b7c7c7b03473cb55a074cc84a184e0e263445287783b9a123847645573928393708f0480300132614067c04fd2cb3a11076ec WHIRLPOOL 8d0c6b596401e6dcdc5c11cd3cf2f842a3dbf52232a2b128a8678c86107ddc0aae9191de93bbb555fc3c0b57293348a1998cd20a8bd6063b7deb3855b813856e
+DIST wps-office_10.1.0.5460~a20p1_i386.deb 81407384 SHA256 cf314da6a7f82a72664633f90bbfc75940a931661c01b6904db5229445d00fd0 SHA512 d720ca78a35bf60fcdb209bd19b5c0d865da87681e08cf7848a01a76f260f23f5de41ba9d3c635f300cd27518f6b0643f6476970128fbb40429ffbc0d76d945c WHIRLPOOL edf33b0a1e2ebf2288bf6a6bf3ad216d99efd7bf68fad1c5c1aab216fc42c03ec503dacb60e6140873374006520b6d292ff03455d1368124fab3ab88989169c1
diff --git a/app-office/wps-office/wps-office-9.1.0.4975_alpha19_p1.ebuild b/app-office/wps-office/wps-office-10.1.0.5460_alpha20_p1.ebuild
index cd7c16fa8240..cd7c16fa8240 100644
--- a/app-office/wps-office/wps-office-9.1.0.4975_alpha19_p1.ebuild
+++ b/app-office/wps-office/wps-office-10.1.0.5460_alpha20_p1.ebuild
diff --git a/app-shells/zsh/zsh-5.2.ebuild b/app-shells/zsh/zsh-5.2.ebuild
index 295b2ca3d673..f456ba735bfe 100644
--- a/app-shells/zsh/zsh-5.2.ebuild
+++ b/app-shells/zsh/zsh-5.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index ee2484c6dee0..f4fc43e7299c 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,2 @@
-DIST ansifilter-1.10.tar.bz2 54091 SHA256 a1f513b441ce9e5de1704671ec6bd3ab029ceec3e44368e32a40874c2f50577e SHA512 1fda6fcd7853d295cc3caae696367b3f11ba0aa7301f1e874725d8904012c8b4f433a86db19dc1ee7426469e8e7575a4bcabc7229f3fa9f6ba2adb3a53435e71 WHIRLPOOL 17e4c839c6838fdd91cf00f637f8eba9b7a78ced07a6ce4beba7d36ac91f45963f4209436525154a675050ad6ab3115136d8f94524c0a9d0ad782c9f7289949f
 DIST ansifilter-1.11.tar.bz2 54132 SHA256 fcd550428203225483c4b049b56c5ac3ce786b4863c7eff5ab9b16b141692434 SHA512 db22a6eca7bd580683b9270abb11711c7fbee1b1a17fd710fd880518207a4c65f1df04d21565b22754109dea9a81e9d4fdba0f8e01eb9dac8555041bb83f4acc WHIRLPOOL d961c7e15381bebde1c11182bd38b119596fdadda8afbe019d7227c32546fd74fab2569b444806fb32ede1295f6237f749146410bf490347c519b037755a56d7
-DIST ansifilter-1.7.tar.bz2 133803 SHA256 a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c SHA512 8040f7d9fd48784a64522218491e956678ee13bf75194c5a0e98e2f1acc8fde3cbdc1514125325692d95c4fd5193fa5ededb950cc778a9bacf3c4ac3aca50cb9 WHIRLPOOL 51736aab49de5bcfbe81db9187caba52811aaa3a06f4cf8e4991d00a597e23244c9dbc7ecbdfbb78c1a40c5cdc3770185ec5b2aa42a41885f11e70eda171cc58
+DIST ansifilter-1.15.tar.bz2 79966 SHA256 65dc20cc1a03d4feba990f830186404c90462d599e5f4b37610d4d822d67aec4 SHA512 7b624b11579c4a88271325054a6023d139ea7ff67fc5552b8ab8387eb16ea54c40c586f242a5ab7f8dd6bf226041bc61a03b5c6acb50e8f915341bd7cd9cdff8 WHIRLPOOL 3e7bd5088b4696bf957ed1c1bbe2c20f6b11f50d856129c1da3651af24f2887ea65c0917db1e85d0d32e5cd6e2bce2177fdd50e0c6d197b05ee07f71415d44a1
diff --git a/app-text/ansifilter/ansifilter-1.10.ebuild b/app-text/ansifilter/ansifilter-1.15.ebuild
index c933334d7554..ec58344fd2f5 100644
--- a/app-text/ansifilter/ansifilter-1.10.ebuild
+++ b/app-text/ansifilter/ansifilter-1.15.ebuild
@@ -1,10 +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 toolchain-funcs qt4-r2
+inherit toolchain-funcs qmake-utils
 
 DESCRIPTION="Handles text files containing ANSI terminal escape codes"
 HOMEPAGE="http://www.andre-simon.de/"
@@ -13,12 +13,13 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
+IUSE="qt5"
 
 RDEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
 	)"
 DEPEND="${RDEPEND}"
 
@@ -40,14 +41,14 @@ src_prepare() {
 
 src_compile() {
 	emake -f makefile "${myopts[@]}"
-	if use qt4 ; then
+	if use qt5 ; then
 		cd src/qt-gui
-		eqmake4
+		eqmake5
 		emake
 	fi
 }
 
 src_install() {
 	emake -f makefile "${myopts[@]}" install
-	use qt4 && emake -f makefile "${myopts[@]}" install-gui
+	use qt5 && emake -f makefile "${myopts[@]}" install-gui
 }
diff --git a/app-text/ansifilter/ansifilter-1.7.ebuild b/app-text/ansifilter/ansifilter-1.7.ebuild
deleted file mode 100644
index 36ccf1b66ee2..000000000000
--- a/app-text/ansifilter/ansifilter-1.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit toolchain-funcs qt4-r2
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
-
-RDEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	myopts=(
-		"CC=$(tc-getCXX)"
-		"CFLAGS=${CFLAGS} -c"
-		"LDFLAGS=${LDFLAGS}"
-		"DESTDIR=${ED}"
-		"PREFIX=${EPREFIX}/usr"
-		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
-	)
-}
-
-src_prepare() {
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_compile() {
-	emake -f makefile "${myopts[@]}"
-	if use qt4 ; then
-		cd src/qt-gui
-		eqmake4
-		emake
-	fi
-}
-
-src_install() {
-	emake -f makefile "${myopts[@]}" install
-	use qt4 && emake -f makefile "${myopts[@]}" install-gui
-}
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 1506aa845801..3bfd58677c83 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -5,3 +5,4 @@ DIST JabRef-2.11b2.jar 15817749 SHA256 f811eb98bdef938c9aaeee5e9807c6ea28a8b4d72
 DIST JabRef-2.11b3.jar 16426897 SHA256 251192bc24448886bb62dbc5d01e0c68ee345c45d83fd586db16e5562894fa78 SHA512 93f691928948346f2e3891d5a52be14159b6e0e953897d12a839026ae125bae9c97082bf8f2e160bf20fd42d7e81fa5385114c5e7800e17be07666aa4ec0f7ed WHIRLPOOL ecf0088eb1b30391851a2c30f502b34accd9d4b1e6133f2f06e6e6689160a1dcd74a7f719c3d1e7d8e489f0bcb1f5187a07403d998a0a3256bacf4cbcaa0a2fc
 DIST JabRef-2.11b4.jar 20366631 SHA256 4f715c5e8849167b234cec2edbf6c8e32f3eaab5b69ff672210746bdb0c9204d SHA512 28d57d75cbd197e9a2fd9307cfd1cac9f8b2a0855c440db2a06292770a068cf7eb67db1af31f7240f70ddd382b33c30cb10c1d4be7e53cfd302efc1671b6a2a3 WHIRLPOOL 6b90bd7668330fa1c41bf2622a3d48acaf98d1b3ae0e5174ec3e85ca12a12f56b6ec42887cda655bdb2863e69899a707eb2be7663dc27f53030315bd3c68da20
 DIST JabRef-3.1.jar 20307649 SHA256 81adaa1b672535e7b64814b6ad8f6a00e8bcf0a82b0849ba4523e36cd440425d SHA512 aab648f19feecf64a9afe3e69092736c0c2c177ee3a6c0dc3a9a9a8cea6d5a0d24201abed7048e4b569b0f1bb4736c1ad75df056243293e7b82795f50eb16476 WHIRLPOOL 437744b7236249e342ccaba9b08164727017b4136246c04a73c824c0df91e9b9f6d0814294f110ab935fb60bcd60d70f921774dfced0375ea19afafe60451c22
+DIST JabRef-3.2.jar 20246639 SHA256 5f3d18052019dd10475de6e8e1d3c900300cd7195d6e1e6262fab104d06abadb SHA512 db7c2cde0e1d858d14b80f7820a729cac97c74a442e65b18d7c8a7366dbc719bef14e652cf44f04256efffd9d42136e2c865347b3975a0450ec13ef4b3cf71c9 WHIRLPOOL 6cf53e25ce220750145282567cf4dbd11f6fcb7e90ae18d3cfafc3f2a001c3933ddcae6bfe33dcd9ee495719a795fdf2b313e872aab788176d038b2984888b39
diff --git a/app-text/jabref-bin/jabref-bin-3.2.ebuild b/app-text/jabref-bin/jabref-bin-3.2.ebuild
new file mode 100644
index 000000000000..a7729010cf90
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.2.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 eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	jar xf  ${A} images/icons/JabRef-icon-48.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+}
diff --git a/app-text/zathura/files/zathura-9999-synctex.patch b/app-text/zathura/files/zathura-9999-synctex.patch
new file mode 100644
index 000000000000..1a8a49239ee2
--- /dev/null
+++ b/app-text/zathura/files/zathura-9999-synctex.patch
@@ -0,0 +1,51 @@
+From f0a86c6ef7c43eec07b0ddc7c002dba506ca1e26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
+Date: Sat, 9 Jan 2016 09:48:53 +0100
+Subject: [PATCH] Use synctex_editor only if WITH_SYNCTEX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without installed synctex, the build fails like:
+
+zathura/main.c: In function ‘main’:
+zathura/main.c:254:26: error: ‘synctex_editor’ undeclared (first use in this function)
+       plugin_path, argv, synctex_editor, embed);
+                          ^
+zathura/main.c:254:26: note: each undeclared identifier is reported only once for each function it appears in
+Makefile:103: recipe for target 'build/release/zathura/main.o' failed
+
+This patch fixes it.
+
+<https://bugs.gentoo.org/show_bug.cgi?id=571346>
+---
+ zathura/main.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/zathura/main.c b/zathura/main.c
+index 060382a..9c0d0d3 100644
+--- a/zathura/main.c
++++ b/zathura/main.c
+@@ -250,11 +250,16 @@ main(int argc, char* argv[])
+ 
+   /* Create zathura session */
+   zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir,
+-#ifdef GDK_WINDOWING_X11
+-      plugin_path, argv, synctex_editor, embed);
++      plugin_path, argv,
++#ifdef WITH_SYNCTEX
++      synctex_editor
+ #else
+-      plugin_path, argv, synctex_editor);
++      NULL
++#endif
++#ifdef GDK_WINDOWING_X11
++      , embed
+ #endif
++  );
+   if (zathura == NULL) {
+     girara_error("Could not initialize zathura.");
+     return -1;
+-- 
+2.4.10
+
diff --git a/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild b/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild
index abacdde969c7..6eefdfc89aee 100644
--- a/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild
+++ b/app-text/zemberek-server/zemberek-server-0.7.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$
 
@@ -11,7 +11,7 @@ SRC_URI="https://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
 
 LICENSE="MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 S="${WORKDIR}"
 IUSE=""
 
diff --git a/app-text/zemberek-server/zemberek-server-0.7.1.ebuild b/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
index 01db58a89f51..905b05a752d1 100644
--- a/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
+++ b/app-text/zemberek-server/zemberek-server-0.7.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$
 
@@ -11,7 +11,7 @@ SRC_URI="https://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
 
 LICENSE="MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 S="${WORKDIR}"
 IUSE=""
 
diff --git a/app-vim/ant_menu/ant_menu-0.5.7.1.ebuild b/app-vim/ant_menu/ant_menu-0.5.7.1.ebuild
index 39393ce30689..700d41801651 100644
--- a/app-vim/ant_menu/ant_menu-0.5.7.1.ebuild
+++ b/app-vim/ant_menu/ant_menu-0.5.7.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$
 
@@ -7,7 +7,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Java ant build system integration"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=155"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 RDEPEND="dev-java/ant"
 
diff --git a/app-vim/csv/Manifest b/app-vim/csv/Manifest
index df779eafad84..0f1ee6515afb 100644
--- a/app-vim/csv/Manifest
+++ b/app-vim/csv/Manifest
@@ -1,2 +1 @@
-DIST csv-0.30.tar.bz2 37632 SHA256 b0dbd098f0730bfad91f46f583779fe1b3a56950199be0844011dbd682ca6ab7 SHA512 9246e54954720951832b838f4b58d144935f7759e62d4cb8ab84623ef0488899b1dcf053bb3c9e0fc5a5529b743840775f454b2ef7ba2d0b711045af84cd14dd WHIRLPOOL 661d9339693c240bab27924dc5c2e33b80faa5b4f86262940b22eef51b84431f7550dc56b4d608e276259b4783fb231c760af61fff2f4ef18d56dfba01910f13
 DIST csv-0.31.tar.bz2 38537 SHA256 8f7970a2ca192e1e35f3a5932992c60e3ec0b23f90afa5cd775f07686bcbd52a SHA512 1d0716765e3268e20ef7b2ed822e7322febbe2c9e9b775e79a2628c4641f157084b6b24d999b051657881acaee5ae8dd36a558ef31e5985bf7bf14ac894d5677 WHIRLPOOL a3866cd8c899565fd5a01bdd79d74a9543a155a308f8cc3f7413c91b1c7b64ecdd0a289f7060c19bd20d6bfbc1df00dc53280828cdf26b7c26bbca7767175c36
diff --git a/app-vim/csv/csv-0.30.ebuild b/app-vim/csv/csv-0.30.ebuild
deleted file mode 100644
index ac1776c16254..000000000000
--- a/app-vim/csv/csv-0.30.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: display and alter csv files"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2830"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="ft-csv.txt"
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
index c5c5290377c4..bf46b7f4cd7d 100644
--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@@ -1,2 +1,2 @@
-DIST dbext-21.0.tar.bz2 97724 SHA256 0f8ef44c342ae324205fd8be8ac326f99e684a26312b17150ebac7b45fff7ac8 SHA512 00b3ce28628416051a471f3396b86e5bb6711388b095cb0e24fb1def6c18be2af77f7ab4e1fcbcf2c87b45e8e1518810636b99f0e2f2df4917d40f0584d205d5 WHIRLPOOL 0a0b0f7bbbc9c31c1016ef388de30352f69ea3a241846bf1e889ee16a1d7b46374d89de4d2c70802d20f75d65b0873b18fa04c411f3e6d8e865d6c10adaa031d
 DIST dbext-22.0.tar.bz2 102728 SHA256 a6f44a4aceb0fc83989122a5ab6988d47330781d8759fe1334fc21071b092b08 SHA512 18370074039f520f137f7e6db032963c1f6ce4b5a5f2e3b6e7f67441af0b195b0315d8cb918ae4bd65f281536ac76e187ec88055c5653213442771d01836a258 WHIRLPOOL 80bc6af335418df61bf58ab8d3c7be1cdee5c41fca5fd8a9c451f088f8f93318ef2d750489049d79322f097e49b621f2be861bbb7e66b0c2b27dbe47ad6b5e2a
+DIST dbext-23.0.tar.bz2 104027 SHA256 92c6b54f66927382862768346a9e24e898f2a3b0a88192588c9d204fda8a0306 SHA512 48fe475b6c8d157e679d0230e981be77fc033e7f5a370e964c5d793b796cc291f15b145e5a642aae5c9fa64916ad6cdf059f59def43ac342a28c07de6e99b333 WHIRLPOOL 2e33df79789158ed775a2546f49f16961f4fa48ae68f03bfbfd6d2f048347b0882877af8b06bf3cb123f7b00aff79ab6c5ef193e40b75d6632bf4e78d427e9cd
diff --git a/app-vim/dbext/dbext-22.0.ebuild b/app-vim/dbext/dbext-22.0.ebuild
index ebf04644b844..b7ca32fa55b3 100644
--- a/app-vim/dbext/dbext-22.0.ebuild
+++ b/app-vim/dbext/dbext-22.0.ebuild
@@ -9,6 +9,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easy access to databases"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dbext/dbext-21.0.ebuild b/app-vim/dbext/dbext-23.0.ebuild
index b7ca32fa55b3..d8e183317024 100644
--- a/app-vim/dbext/dbext-21.0.ebuild
+++ b/app-vim/dbext/dbext-23.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$
 
@@ -9,6 +9,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easy access to databases"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ~ppc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest
index 180188d99abe..27ed8ed83d61 100644
--- a/app-vim/pathogen/Manifest
+++ b/app-vim/pathogen/Manifest
@@ -1 +1,2 @@
 DIST pathogen-2.3.tar.gz 6136 SHA256 3a2ec24f47dbb59dd4f3fea12f89cf64add951da4646dedced54b7284fdc38ac SHA512 da603a4d111dce6fba1542e3301a8e180def545d1f81339bc60782698c777625500e158d0f15c01ac0144e6a3045bb2d2d2ed19bfe661c233a0633a9aa14b749 WHIRLPOOL ab99d35d078e65eda60d5b3d96fa77f0913a97bcec19aceb2a104e493561e2fff8874c8fa3bb67f2875356ddcfe827972d84bacc5cb72ba42fd33613495a60bb
+DIST pathogen-2.4.tar.gz 6458 SHA256 2551a0f4ac3681cba97c265af088460c2977fba9c5152afb4ce1b56fdf3195a8 SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe WHIRLPOOL 95f54f2cb1747fc92aefca54a7497155db05e89c7dd7249717fce6de34838e7a4ab57aadf46ef8eece668ae7156d4c4b5d481b7fd3dc16b248652b57334fe4b3
diff --git a/app-vim/pathogen/pathogen-2.4.ebuild b/app-vim/pathogen/pathogen-2.4.ebuild
new file mode 100644
index 000000000000..718bb0955b4c
--- /dev/null
+++ b/app-vim/pathogen/pathogen-2.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: manage your runtimepath"
+HOMEPAGE="https://github.com/tpope/vim-pathogen/ http://www.vim.org/scripts/script.php?script_id=2332"
+SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+S=${WORKDIR}/vim-${P}
diff --git a/app-vim/pyclewn/pyclewn-2.1.ebuild b/app-vim/pyclewn/pyclewn-2.1.ebuild
index e1cc815f98cf..94de03a7c457 100644
--- a/app-vim/pyclewn/pyclewn-2.1.ebuild
+++ b/app-vim/pyclewn/pyclewn-2.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 inherit eutils vim-plugin distutils-r1
 
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
diff --git a/app-vim/syntastic/Manifest b/app-vim/syntastic/Manifest
index 83927af2b23b..4322f6284993 100644
--- a/app-vim/syntastic/Manifest
+++ b/app-vim/syntastic/Manifest
@@ -1,2 +1 @@
-DIST syntastic-3.6.0.tar.gz 189617 SHA256 b47c5ad0290f7f8e5fda49fde996258509c939b0244de812bed847de1d2a0557 SHA512 855577a796ffd8e9077d4f900928beba3f5f78348f81d39a776c7659713be75170285b421e8751b06639100a2580a2b7fc5f1e4aefb4c7225dc6b2f11ef02e25 WHIRLPOOL 5df8dc3a01f14e4e83366b37d819efb176cf17d49cbfe4a14ce990a4027eb4e507e29a3e408f472b637f180713d969b88a298fb0cf4edd3deaa02dad79b0fdb1
 DIST syntastic-3.7.0.tar.gz 198480 SHA256 4006fdd5e786ceeb493817c2b6b0d1e6a403089436c958239359a3e7fb7ab016 SHA512 c435969a6c309d303bdd74c87cad25df56cd30028a75be8e58f035e6dd00b0390654ff2ee8e552a1a2495054426b9f43ea7f7db45691e6bddf9783ee0a4ccb73 WHIRLPOOL 26c3258cbbdd3e4cc637c79cf2f3c53d87322b35a3c0d89021e925e10a5006b87ff2ecc3202983365dd4e5b0489ac4e0da44211fd61edff945ebd7c6efd36002
diff --git a/app-vim/syntastic/syntastic-3.6.0.ebuild b/app-vim/syntastic/syntastic-3.6.0.ebuild
deleted file mode 100644
index 8b4403a6a4cc..000000000000
--- a/app-vim/syntastic/syntastic-3.6.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
-inherit vim-plugin
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scrooloose/syntastic.git"
-else
-	SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="vim plugin: syntax checking using external tools"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
-LICENSE="WTFPL-2"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-src_prepare() {
-	rm -r _assets LICENCE README.markdown || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Syntastic has many optional dependencies depending on the type"
-		elog "of syntax checking being performed. Look in the related files in"
-		elog "the syntax_checkers directory to help figure out what programs"
-		elog "different languages need."
-	fi
-}
diff --git a/app-vim/syntastic/syntastic-3.7.0.ebuild b/app-vim/syntastic/syntastic-3.7.0.ebuild
index be5b783accd2..8b4403a6a4cc 100644
--- a/app-vim/syntastic/syntastic-3.7.0.ebuild
+++ b/app-vim/syntastic/syntastic-3.7.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/scrooloose/syntastic.git"
 else
 	SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="vim plugin: syntax checking using external tools"
diff --git a/app-vim/tagbar/Manifest b/app-vim/tagbar/Manifest
index 82cbfac1a123..1a12bcec0e67 100644
--- a/app-vim/tagbar/Manifest
+++ b/app-vim/tagbar/Manifest
@@ -1,3 +1 @@
-DIST tagbar-2.5.tar.gz 44838 SHA256 b9632c1924dbe2c4b39ecda49a61bf956e059a09cf0017995059cc85078b8ae8 SHA512 da6491abc77fdcaf5f8ed1de82533d5d007f07d13bda67efeaf50a2a227117417a21bef92b5b05bed9ab5c0031d51ee386352581969ac714f92393de989da690 WHIRLPOOL 2dca052fdd03d5eb1207a4e12a4050f9a3d35b671fe2b6a786ab6ac5531e8cce7f3f28614986d57503e5369af67f6fe00a3d144df332ba6a656c88f8be76249c
 DIST tagbar-2.6.1.tar.gz 51639 SHA256 c061a7e0a45a166f4558b31e6c47b9fd701f5fa1319527b65a268ea054dea5fb SHA512 eb0f29dc2f08d943e1ac0c0fe97ed72a49b85e22d105815a5557e205532be379d3ce8429c5303b917c005b465a7385161ff2edc96efc0fc312178155c67a7c22 WHIRLPOOL d5f7b0916e1eb0faa9a7887a4249ace5f0b8e369527a89010dabfee55507516050a5e5dd2184ab43c095ff514708bf25ab6d78fea85db8821804bbe908ebbc27
-DIST tagbar-2.6.tar.gz 51432 SHA256 46b14e1b3059ffe7d736ae586d94978898e29d03e0cc3545110e6eb8e309e399 SHA512 f51832805c6dd882972192186b67720b87408b78d3d13cb3577a785821fdc750e90a6415437381a259b465f31bc9ca5b4a73f09564a35d4b2bbb1c0cf9fa9fb4 WHIRLPOOL cc9a1c30afea5ac3ef695010f078e5f4f95dd5d92b203ba679c37e087b59621000cbe4358e09a8c44983239dfbd50b8ba282ba2804a307978283468c6ee99759
diff --git a/app-vim/tagbar/tagbar-2.5.ebuild b/app-vim/tagbar/tagbar-2.5.ebuild
deleted file mode 100644
index 82eb811af531..000000000000
--- a/app-vim/tagbar/tagbar-2.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
-HOMEPAGE="https://majutsushi.github.com/tagbar/
-	http://www.vim.org/scripts/script.php?script_id=3465"
-SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-util/ctags-5.5"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/tagbar/tagbar-2.6.ebuild b/app-vim/tagbar/tagbar-2.6.ebuild
deleted file mode 100644
index 2ab963007419..000000000000
--- a/app-vim/tagbar/tagbar-2.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
-HOMEPAGE="https://majutsushi.github.com/tagbar/
-	http://www.vim.org/scripts/script.php?script_id=3465"
-SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-util/ctags-5.5"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/taglist/Manifest b/app-vim/taglist/Manifest
index 7ef37dcc3fc2..c305675fd78d 100644
--- a/app-vim/taglist/Manifest
+++ b/app-vim/taglist/Manifest
@@ -1,2 +1 @@
-DIST taglist-4.5.tar.bz2 39272 SHA256 94170e61c3a05f5d1ed8e8475ab2e3eeafc264629d245f1a8717ec2ddc8ca84c SHA512 71b9fe005753e1a211db0f264cd48a4aa3a2fbccfe97bab392c5ecc68db317c591aecdd7586cbecdf11950fd4dcc56d6f94f15599df7aec020924fa6f064035e WHIRLPOOL 7cd850668152f1516501f63361b3206ce79fe9fce2dfe6f78f42cd294e9eaf4db093674c1ad05db874aef83da2ecb1b7527b0e0c5bf79494d9e120f5564cff1b
 DIST taglist-4.6.tar.bz2 40344 SHA256 30716a97b4667a862849dee122b843c2522c649e60553e8cbe2277bb93ccb6a3 SHA512 64686f2685cf4f9b09eeb7e1981a1b9d514cce2f6ea4bdf3e3613037d9818556ad6ed95740a84b4d73eba3fa1d5d58a41f15e1bc0a1403c50a810f5a704f3073 WHIRLPOOL 4e7b154e1c693cfee821e55e9b4d8f2b26f1c5dbacce6015757ee4b13586927ba5dca2ab726e23ad090944e55e0cce9676c01c8c21efa9ece967cb24d8bd5acd
diff --git a/app-vim/taglist/taglist-4.5.ebuild b/app-vim/taglist/taglist-4.5.ebuild
deleted file mode 100644
index 5fbdd6f1a409..000000000000
--- a/app-vim/taglist/taglist-4.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit vim-plugin eutils
-
-DESCRIPTION="vim plugin: ctags-based source code browser"
-HOMEPAGE="http://vim-taglist.sourceforge.net/"
-
-LICENSE="vim"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="dev-util/ctags"
-
-VIM_PLUGIN_HELPFILES="taglist-intro"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.4-ebuilds.patch
-	[[ -f plugin/${PN}.vim.orig ]] && rm plugin/${PN}.vim.orig
-}
diff --git a/app-vim/tcomment/Manifest b/app-vim/tcomment/Manifest
index 5297651728b0..ac0493a30712 100644
--- a/app-vim/tcomment/Manifest
+++ b/app-vim/tcomment/Manifest
@@ -1,2 +1,2 @@
-DIST tcomment-3.06.tar.gz 37691 SHA256 5a12cb8da962758f6635d328cde0421f4e34e4cffa99503f259f7939127ae690 SHA512 f26310d69e9a81f85e0270ca6a85b86c9ad841fbff98a0ea06134209d82f7f33298a7d7e07e641c5fde1c01a59a52fdfd8f5d649665d73f07a4ed42b1b41ca92 WHIRLPOOL 3531681fefe140911e7cb1683ba8b1969f328cd8658bfda57a659a66ded56dba05910daa4c097e9d10d6b101adcc9757858e69ea3d14eca48c3818ba31b575dc
 DIST tcomment-3.07.tar.gz 37827 SHA256 85f33774ebe7357600472520fb7ea48bfec8998a26f74b4e00e923f8aea2b711 SHA512 e18bc85d0ad263842109f83a34b14c4a167ae31c3c29310fdc8c586eef53949525d675f54d9b5d744a1248ab64b4881064923aef73e09beebabc29ca9bbfe18d WHIRLPOOL 7645fca39f6b2fe4cca43d9df3f7be8057ad10aa18d36e24bd5313612fe93bcf3c105580655a4842b00b9c90dc670dc3aa54ea56439931b7ccbed5b038b15e18
+DIST tcomment-3.08.tar.gz 38317 SHA256 4e88509c10dbbb6fdbdf93955c004fa3d44c10536a63e1c3e4348e65454e7256 SHA512 9cb582e4c82334a5752f2a0b5b3e753fc7a4bfd3db76dd8f1ca49938f3f9890b8723476a0c3400f60ff8b358d52bf32fa8497c7b1c6118afd21bb860b2ce6061 WHIRLPOOL 855a4516e0864989bde077fe476778a1f33d60423a6fda1da442c4d0e76e727931d868fdb6fad140535a0398fac15ba555fe71fd418cfefea214b275d0e87404
diff --git a/app-vim/tcomment/tcomment-3.07.ebuild b/app-vim/tcomment/tcomment-3.07.ebuild
index 4b2666e3e2bd..e9fc49fc0826 100644
--- a/app-vim/tcomment/tcomment-3.07.ebuild
+++ b/app-vim/tcomment/tcomment-3.07.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: an extensible and universal comment toggler"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
 SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/tcomment/tcomment-3.06.ebuild b/app-vim/tcomment/tcomment-3.08.ebuild
index 4b2666e3e2bd..4b2666e3e2bd 100644
--- a/app-vim/tcomment/tcomment-3.06.ebuild
+++ b/app-vim/tcomment/tcomment-3.08.ebuild
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index 1ae458a527ec..64d81f68784f 100644
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@@ -1 +1,2 @@
 DIST vim-latex-1.8.23-20130116.788-git2ef9956.tar.gz 287749 SHA256 99f47151d5108901f85c793496a301341fe6be66b39bd5b42ea7db2e0afd426c SHA512 27cbea24ef5cf8c5ef6c2a9790bd1745d7d907640dd47dd199e579b8e04c33e30b1907f89e9898f8197e46f002ce4145e5c63635801ca8729d4ad988aaa7b590 WHIRLPOOL 74d11d665568ff4afaa40e3208764919e32c9f899ba3e993ed4e4d0049c9f067c2446e2abdecdf3b598ec89c9d4187f24f9ca04a654ecbaa4dc2cfdcc0e06975
+DIST vim-latex-1.8.23-20141116.812-gitd0f31c9.tar.gz 288376 SHA256 b3f8c395ae4d012bc6597e3beb22568c84554195bcba3cd3edc6c84270458eab SHA512 18444b7aef9ca1d7288e2616c0329274172afa3f932096fddc5e40888f65c8cacae2454ab316c5699395268aa88af13b32f3ae6e36058e27e4e48e6d6591b762 WHIRLPOOL f5a133483fd3f8ce33c82baa82fb6632942baa9d919814516904994c848264ec08d89cac299592d9fd741282a4644f63c2ca46ce5e8296c4dd64bf36d46a46f7
diff --git a/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild b/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
new file mode 100644
index 000000000000..1356e266f3aa
--- /dev/null
+++ b/app-vim/vim-latex/vim-latex-1.8.23.20141116.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=( python2_7 )
+
+inherit vim-plugin versionator python-single-r1 eutils
+
+MY_REV="812-gitd0f31c9"
+MY_P="${PN}-$( replace_version_separator 3 - ).${MY_REV}"
+
+DESCRIPTION="vim plugin: a comprehensive set of tools to view, edit and compile LaTeX documents"
+HOMEPAGE="http://vim-latex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="html python"
+
+RDEPEND="|| ( app-editors/vim[python?] app-editors/gvim[python?] )
+	virtual/latex-base"
+
+S=${WORKDIR}/${MY_P}
+
+VIM_PLUGIN_HELPFILES="latex-suite.txt latex-suite-quickstart.txt latexhelp.txt imaps.txt"
+
+src_prepare() {
+	# The makefiles do weird stuff, including running the svn command
+	rm Makefile Makefile.in || die "rm Makefile Makefile.in failed"
+
+	epatch_user
+}
+
+src_install() {
+	use html && dohtml -r doc/
+
+	# Don't mess up vim's doc dir with random files
+	mv doc mydoc || die
+	mkdir doc || die
+	mv mydoc/*.txt doc/ || die
+	rm -rf mydoc || die
+
+	# Don't install buggy tags scripts, use ctags instead
+	rm latextags ltags || die
+
+	vim-plugin_src_install
+
+	# Use executable permissions (bug #352403)
+	fperms a+x /usr/share/vim/vimfiles/ftplugin/latex-suite/outline.py
+
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "To use the vim-latex plugin add:"
+		elog "   filetype plugin on"
+		elog '   set grepprg=grep\ -nH\ $*'
+		elog "   let g:tex_flavor='latex'"
+		elog "to your ~/.vimrc-file"
+		echo
+	fi
+}
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 da15ded97d64..c159ab590ff6 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.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$
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz"
 LICENSE="public-domain"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~x86"
 IUSE="doc examples static-libs"
 RESTRICT="test" # No tests but test target blows up!
 
diff --git a/dev-cpp/gtkmm/files/gtkmm-3.18.0-gcc47.patch b/dev-cpp/gtkmm/files/gtkmm-3.18.0-gcc47.patch
new file mode 100644
index 000000000000..6a70cd6b1636
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-3.18.0-gcc47.patch
@@ -0,0 +1,44 @@
+--- a/gtk/src/menushell.ccg	2015-07-16 21:00:55.000000000 +0200
++++ b/gtk/src/menushell.ccg	2015-12-09 01:03:45.127863899 +0100
+@@ -43,7 +43,7 @@ MenuShell::MenuShell(GtkMenuShell* casti
+ {}
+ 
+ // TODO: Why do we need a custom dtor?
+-MenuShell::~MenuShell()
++MenuShell::~MenuShell() noexcept
+ {}
+ 
+ void MenuShell::accelerate(Window& window)
+--- a/gtk/gtkmm/menushell.cc	2015-09-22 11:41:47.000000000 +0200
++++ b/gtk/gtkmm/menushell.cc	2015-12-09 01:06:27.641701385 +0100
+@@ -54,7 +54,7 @@ MenuShell::MenuShell(GtkMenuShell* casti
+ {}
+ 
+ // TODO: Why do we need a custom dtor?
+-MenuShell::~MenuShell()
++MenuShell::~MenuShell() noexcept
+ {}
+ 
+ void MenuShell::accelerate(Window& window)
+--- a/gtk/src/widget.ccg	2015-07-16 21:00:55.000000000 +0200
++++ b/gtk/src/widget.ccg	2015-12-09 07:36:47.328538621 +0100
+@@ -413,7 +413,7 @@ void Widget_Class::get_preferred_width_f
+     (*base->get_preferred_width_for_height)(self, height, minimum_width, natural_width);
+ }
+ 
+-Widget::~Widget()
++Widget::~Widget() noexcept
+ {}
+ 
+ void Widget::reparent(Widget& new_parent)
+--- a/gtk/gtkmm/widget.cc	2015-09-22 11:44:13.000000000 +0200
++++ b/gtk/gtkmm/widget.cc	2015-12-09 07:39:29.318214641 +0100
+@@ -423,7 +423,7 @@ void Widget_Class::get_preferred_width_f
+     (*base->get_preferred_width_for_height)(self, height, minimum_width, natural_width);
+ }
+ 
+-Widget::~Widget()
++Widget::~Widget() noexcept
+ {}
+ 
+ void Widget::reparent(Widget& new_parent)
diff --git a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
index 14aad8734783..401ce9966c41 100644
--- a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2 multilib-minimal
+inherit eutils gnome2 multilib-minimal
 
 DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
@@ -37,6 +37,9 @@ DEPEND="${RDEPEND}
 # eautoreconf needs mm-common
 
 src_prepare() {
+	# Fix building with gcc-4.7, fixed in next version, bug #567882
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+
 	if ! use test; then
 		# don't waste time building tests
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
diff --git a/dev-cpp/gtkmm/gtkmm-3.18.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.0.ebuild
deleted file mode 100644
index 1e80a4583b98..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.18.0.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"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for GTK+"
-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"
-IUSE="aqua doc examples test wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.46.1:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.18.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.24.1[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.1:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-#	dev-cpp/mm-common"
-# eautoreconf needs mm-common
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	einstalldocs
-}
diff --git a/dev-db/henplus/henplus-0.9.8-r1.ebuild b/dev-db/henplus/henplus-0.9.8-r1.ebuild
index 20cd62e2a6a3..0651ab47fe63 100644
--- a/dev-db/henplus/henplus-0.9.8-r1.ebuild
+++ b/dev-db/henplus/henplus-0.9.8-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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://henplus.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-java/commons-cli:1
diff --git a/dev-db/henplus/henplus-0.9.8.ebuild b/dev-db/henplus/henplus-0.9.8.ebuild
index 52df2f721b98..1a73f649361d 100644
--- a/dev-db/henplus/henplus-0.9.8.ebuild
+++ b/dev-db/henplus/henplus-0.9.8.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://henplus.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="dev-java/commons-cli:1
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
index 2040c5f98f46..7fd742941d69 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
index 5da719f1acc1..21cf2c364934 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.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$
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 
 # glibc: deprecated mutex functions, removed in 2.36.0
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
index 2fa905ae700b..c846c5cc8b12 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.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$
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 
 # glibc: deprecated mutex functions, removed in 2.36.0
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild
index d5914d616408..1547dcd8db30 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4.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 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 
 # glibc: deprecated mutex functions, removed in 2.36.0
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
index ecb764a6252b..68f2bfb67c68 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
index ecb764a6252b..68f2bfb67c68 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild
index 69be319ba493..45ff8d3a98e3 100644
--- a/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.0.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.frijters.net/openjdk6-b22-stripped.zip
 LICENSE="ZLIB GPL-2-with-linking-exception"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/mono-2
diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
index 1cc180fe31db..ba88ae68ba59 100644
--- a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.0.2.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.frijters.net/openjdk6-b22-stripped.zip
 LICENSE="ZLIB GPL-2-with-linking-exception"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/mono-2
diff --git a/dev-haskell/adjunctions/Manifest b/dev-haskell/adjunctions/Manifest
index 05f268363d3b..31089c9569f6 100644
--- a/dev-haskell/adjunctions/Manifest
+++ b/dev-haskell/adjunctions/Manifest
@@ -1,2 +1,3 @@
 DIST adjunctions-4.2.1.tar.gz 14314 SHA256 65a64cd42dcf356c2b44fffc4360f8cbf494702f7574b5a1e57e1864b0f8f46f SHA512 e287716e6399201a331f9c7dbd000e06aa1dabedb7a6c41a9d336bd85fde78b810d2181554199dbbd61ef42d7b6429612032fd51c92ed5d6ea8d7f49b59afe25 WHIRLPOOL 08f490379af7cab42c4934ebfea39bbd610bb1b0b39ca1f83e289ecab057d209e15e6aa4664bf5744a330561514167b1ae6f75f5a88e9c3a58929d7966ba35c4
+DIST adjunctions-4.2.2.tar.gz 15442 SHA256 58f2d5e66bc61cb8d2fe2148c9b3df3c95e87a353dfc7ed18af2cbeb2318e002 SHA512 039fd506839a1955d89e7c4ae3cb6c824e30a85b2f2e59de341b8b6f54bf2f363f047902a619dc35d6f86e5e71c1f1741181f1d2b86a233557d37b9f873cffdf WHIRLPOOL 9d8d041aadd1d956b975d391dc7f2bebdbc0c5c2c2233f61b4195c74a87fa4ca1f12572624de7a3aaf45fc4b33598f6820fcd9d78fd8d16b162caae0afbeb771
 DIST adjunctions-4.2.tar.gz 14300 SHA256 31c9988b9e76fa342bff9314af5fd088f99bcaf6d66adb3ba3dc343f4d36251f SHA512 019f5e92982723edcc371e303aeaf9d04f5245b979feb1f17eb6c1a1af4a2982a6bde98f59b705b080b547c64349637e8acc43ebe913cc10c98a636be30ee505 WHIRLPOOL 5b2f480443f50ec52f037008a52e5920c393dcae7f3c45744625f7693e3c8c81c2f1604c54e4318e0f3e9c3d3b7f3ecc80b495c5b9050eb2dc2498ba2ff55002
diff --git a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild b/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
new file mode 100644
index 000000000000..f78eb7e7a82e
--- /dev/null
+++ b/dev-haskell/adjunctions/adjunctions-4.2.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Adjunctions and representable functors"
+HOMEPAGE="https://github.com/ekmett/adjunctions/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/aeson-qq/Manifest b/dev-haskell/aeson-qq/Manifest
index dafb73444a0e..f9d382899aa1 100644
--- a/dev-haskell/aeson-qq/Manifest
+++ b/dev-haskell/aeson-qq/Manifest
@@ -1,2 +1,3 @@
 DIST aeson-qq-0.7.4.tar.gz 4202 SHA256 9b4c5583e21007aade87ac75d5c5ee95ef910641c0fddea67b25b42ddb4dcc72 SHA512 4ca302f27d03698d661bf04c8fa2cfb2d725988e694f62bddfd0ae544e64c6b4980b796cf4b85e13fd9ae289922b242e649abc71df2588306cd024d38e7d90fb WHIRLPOOL ad1707f9d8480fdecdd46475c2c5b4404a3a2765e09d0dcbe11dc29e349b86ac0a5151906dd795ab95c33f1e75b999b70fb5641dd31f364759bddc6b4619358f
 DIST aeson-qq-0.8.0.tar.gz 4257 SHA256 eec4bc1cac531c784be01bd2db5b1113c464d6bf2b84dcc9c9421a15601d7a8b SHA512 16fa193e984f1cdfba4556cc416ec9a5a6dfcf16bd359e877a920a037fe979cf97b62f1b986cf14124cc2100463d8048d7014ef4fc887415b3b56a12fe5fd5b4 WHIRLPOOL d9cc0e74ef731709ccdbb9a01ed209d837e6b6405275662fb980dd4017adb3aff5976e50f584199dc1ed4f4dad19b41e6ccac6ceda0f5c66942a1949d047ab66
+DIST aeson-qq-0.8.1.tar.gz 4286 SHA256 2dcd2392902baac446e317621df509b09db9dca9b8c9187e53701226f18013fd SHA512 b1c697c60b7ec721f7801f5ff242ddceaa19a9ada257e7c6b3d3ef502163c058a50bed1110f8fbf761fa8f3da79abec33a04edb2b6555b0d6cf9a0710ad0302d WHIRLPOOL 2f5e1019ea68635c85ad48b1a42db94b419e0a4004002a026f0dc3b024579cf61914f1dbc319307f7b2d5a707f962480e0d429d82790fe69b7879c2b07871564
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild
new file mode 100644
index 000000000000..ec46dbe1d221
--- /dev/null
+++ b/dev-haskell/aeson-qq/aeson-qq-0.8.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="JSON quasiquoter for Haskell"
+HOMEPAGE="https://github.com/zalora/aeson-qq"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base-compat:=[profile?]
+	>=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 539b86d0352d..ddbcaa213a91 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,4 +1,4 @@
-DIST alex-3.0.5.tar.gz 100004 SHA256 c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659 SHA512 0a6a2500b4f8a96e1fd6252b11f7684e47875b80c0113a4ba0e855b54ccd45054f21af6cac30c3edb3b9ac86a7fc60810ea33376a7ab78794f980e3cf9a22eb9 WHIRLPOOL 5c9b07f7eae546d5920c9da4dd2d198d440275da1943d155ae53aaa92fbb9bc9e8c9c91a1303c6130c9341c7ba6518665f0ff383605fa1ecb8d4bd58066f3a87
 DIST alex-3.1.2.tar.gz 101215 SHA256 1d14eb255c44f440f04876c496ed5db24aba8d05b45d665463633afe92361e6d SHA512 21874caf41412d926866b0450db9e29984d1df076d277a2325b3d0b80114e039462ab766b0964177f98d9b625635e219489271ab2853e39f1fef3e7d6caa8660 WHIRLPOOL f38c2381d5587bb11754011c31104477a4fbc577f9fd469eab9b255e74a0efe093a25538296093bdf4a0369e545402865fff8c92f20ec3982d83113c761a46ce
 DIST alex-3.1.3.tar.gz 99868 SHA256 8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92 SHA512 f09f720627b9f2cae5d9d3a99488c2249e82c9310f0a436bccbd5238bd3215fae287706ee6f7530533c801348bdbfebc9fd54cafc15a75d528462b2ee987eb3c WHIRLPOOL 8bdaaa8ee0e4f431603f2e299a83b3d0c30b46bfe19863a04c487687afe377ec5df34ba411c3669412cc406e30ab4e176afad51491ea1612bd19ab620a99f1f1
 DIST alex-3.1.4.tar.gz 101827 SHA256 d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f SHA512 880a6a97b62701712f28c9dc649d90c50bfedecd2c52d7a3781b2f1672826cb2b7a8872528acbae16448494f07743a4c2b4a80e4a9d8de049077fdf4f4bd75d0 WHIRLPOOL c0dd2e8f7925da7ee2ac4893a35330bf0a96561204adf161c0ed34d8616fea220eb86e4645f091af2f94b9952b00262ba84c7c32367a3ec4847645b8fae74aec
+DIST alex-3.1.7.tar.gz 103624 SHA256 89a1a13da6ccbeb006488d9574382e891cf7c0567752b330cc8616d748bf28d1 SHA512 0c4e87011617d8f8ad7cdf32b91e3ecc65ad66ea378c8086de8cbeb7ae3b37df478fb834e3bc453e3448fcae9d03b19ce9844bba35ad66a3cdf6e912790fe0a1 WHIRLPOOL d8f0a87afab475805fc56f6c2cc35c786c9a8431cdcf93b00677546e1c2e895e3828d100559dbd693a501dcc30d0c62d89132d7d35ba6a8ea80e97133afa18e2
diff --git a/dev-haskell/alex/alex-3.0.5.ebuild b/dev-haskell/alex/alex-3.0.5.ebuild
deleted file mode 100644
index fd3a06a297b0..000000000000
--- a/dev-haskell/alex/alex-3.0.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit autotools eutils haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="http://www.haskell.org/alex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		>=dev-haskell/quickcheck-2
-		>=dev-lang/ghc-6.10.4
-	doc? (	~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )"
-
-src_prepare() {
-	HCFLAGS+=" -XBangPatterns" #fixes build failure on BE platforms; bug 466778
-
-	cabal_chdeps \
-		'build-depends: process' 'build-depends: process, base'
-
-	for f in Scan Parser; do
-		rm "${S}/src/$f."*
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf || die "eautoreconf for docs failed"
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf || die "econf for docs failed"
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1 || die "emake for docs failed"
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
new file mode 100644
index 000000000000..655ae146408a
--- /dev/null
+++ b/dev-haskell/alex/alex-3.1.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="bin test-suite"
+inherit autotools eutils haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="http://www.haskell.org/alex/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-haskell/quickcheck-2:2=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	doc? ( ~app-text/docbook-xml-dtd-4.2
+		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2 )
+"
+
+src_prepare() {
+	# drop depend on itself and happy, otherwise cabal tries to regenerate it
+	rm src/{Scan.x,Parser.y} || die
+
+	for f in Scan Parser; do
+		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
+	done
+
+	if use doc; then
+		cd "${S}/doc/"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# make sure we don't accidentally use those
+	# installed in system
+	haskell-cabal_src_configure \
+		--with-alex=false \
+		--with-happy=false \
+		--flag=small_base
+
+	if use doc; then
+		cd "${S}/doc/"
+		econf
+	fi
+}
+
+src_compile() {
+	cabal_src_compile
+
+	if use doc; then
+		emake -C "${S}/doc/" -j1
+	fi
+}
+
+src_test() {
+	# workaround https://github.com/haskell/cabal/issues/2398
+	emake -k -C tests all || die
+}
+
+src_install() {
+	cabal_src_install
+
+	if use doc; then
+		doman "${S}/doc/alex.1"
+		dohtml -r "${S}/doc/alex/"
+	fi
+	dodoc README
+}
diff --git a/dev-haskell/alsa-mixer/Manifest b/dev-haskell/alsa-mixer/Manifest
index 657d40b45499..e6773bf58f24 100644
--- a/dev-haskell/alsa-mixer/Manifest
+++ b/dev-haskell/alsa-mixer/Manifest
@@ -1,3 +1,4 @@
 DIST alsa-mixer-0.1.2.tar.gz 6901 SHA256 081f3a62f83a269d72e0b0fac8bae8c81e9ec342d592fa25abe57f7206cf4414 SHA512 fae4c1f9b65d47a55b2674b04c38f46fc440222c7215b1bb95de14b7c642068392a73c0cebb08b4e3cf49ab824ec78a57d942279364e28bfa45be471f1b8fdfa WHIRLPOOL de98a902fe2d33e019ab57f90024c1caea462089385f870e6b071c76a25ae266ca81e55470bef5003abc7edc1668c67f0ef43ee3edaa1e9b8f3e86b436699b10
 DIST alsa-mixer-0.2.0.1.tar.gz 7176 SHA256 197a98c9f5da86ea3f93ac570a0587ab0a754ee70c7189dbbca315c4099f068c SHA512 74b0f3b2f4e76130a0e6afdf1d9bb0b64e2bcc192866a6c17dd737ea4e63bf69b53d548a6e1ba15c509751bb769db6b202e08343b25ed7872f97b00a5ee3f6ac WHIRLPOOL d6b1ae3594347e4d9b7d18a8840ff1584d0bd68a88d26414fad6434da17c1d424541d2a568b5a9e647c75134606518de44fe9abf487141de907baf508700469f
 DIST alsa-mixer-0.2.0.2.tar.gz 7184 SHA256 139e837a47c31c7b6e41c7ffead7558fde8cde468b91f27d5a19a97490154c87 SHA512 f480008cfe5dd87e01b22bd3af44caee17095dc1be2e535acdca4cb2b56cd87fb086b8222ae10b1ca866818469dff7309ea6e0b7ec22ad83cdff07e6a702aa76 WHIRLPOOL 08412de6b32811cf9634751acf208b55fd3c21cb8bdd0202ae9a1dbcd4738ec397d8c94f4cc5ab34c74986897ed11db6b4b635e1c68f1cde5370acb30a64643c
+DIST alsa-mixer-0.2.0.3.tar.gz 7269 SHA256 f76deb4081a2ce4a765e78a017b2e13c073d2aaa5a2d2652fd5e635dd169cf8d SHA512 32bce115331a622cdc944c9dbeb8ae886793330a4eadce35de857145d4440d7bc8bbac518b7739613436958b392133bae5f1da2cd91c6d21810373fda8a69083 WHIRLPOOL c82a03c8129e9b5de097021a066174d61ee0c33c94eab89e541bfeef0111bf3266db577bd2e08e3c9d0aced060a8cf6ebbfa0f5761393d4762f282dc4e0ee50c
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild
new file mode 100644
index 000000000000..b3ecf78fc401
--- /dev/null
+++ b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the ALSA simple mixer API"
+HOMEPAGE="https://github.com/ttuegel/alsa-mixer"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	media-libs/alsa-lib
+"
+DEPEND="${RDEPEND}
+	dev-haskell/c2hs
+	>=dev-haskell/cabal-1.16.0
+"
diff --git a/dev-haskell/alut/Manifest b/dev-haskell/alut/Manifest
index c3ab90c4d16a..0c3709fdff26 100644
--- a/dev-haskell/alut/Manifest
+++ b/dev-haskell/alut/Manifest
@@ -2,3 +2,4 @@ DIST ALUT-2.1.0.0.tar.gz 69999 SHA256 813f7acf020a650c6ffade81fb31f7849765400f44
 DIST ALUT-2.2.0.0.tar.gz 94174 SHA256 9d5ffa3450c51d641f055eaa48c0613984b45c46347a3e9055b098abba0e3a44 SHA512 4d9111b2d64d33b5a6c7a4c1c4210086a5ed1cf824f1d7753cc9036c57a8a77a6b88ce2effd5929d36313220505197a71369ee47e29e81ca98d8a2b7a537c041 WHIRLPOOL 55853a9a00193dc25d9c693d297678b9bbb13c6a9131eeb64adc5642b53603083fbad4315c71ce90eaa0d59d5fa9939786b2f76bd0b2f85cfc99bd198bafadd1
 DIST ALUT-2.3.0.1.tar.gz 25500 SHA256 f9511be911b73eb4c7358f69e1ed12746ba0b30e7e26e9a4a5825dcbd6a23e66 SHA512 c2fdb231105735f82a1500948cecd184ffc89cef3e8c3ca992107463c2812da74cf260504823ef1fe5e038a2bcf54cec5a004fc052d20d95e856f153c4adf61d WHIRLPOOL 80dc73ba7f434f17c863bafdcddd118b90b09f7cebdb8bf8ea7e907c31d71807b6b42631f78d6d736ce2e5ce785ff9fcf21901e8828d401eac2bc2a7822f67f2
 DIST ALUT-2.4.0.0.tar.gz 26075 SHA256 0f5cf9362ace34a9739cd3a45015782a0102015e62c8dd8e290d7952e6ff193d SHA512 c6c00114bd25cdb26df8ac952144976f5bd7f5758cf3ff06c972a7ed08982c216b21220af85d71f98be8db36d99e85fc3859a963738812b86162603cebdc3e00 WHIRLPOOL 85761dccaabf11270fc7985dfed856cf6868ffaa3522be42a8e73e41752012d99e5792fa114b669b817b13d3053ef1dd5da050a44d0e1209675982609ca8fe5d
+DIST ALUT-2.4.0.2.tar.gz 26231 SHA256 b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87 SHA512 b2ede23635f73660db008e402567c376ef77c081312b76767a2c6d5a4f30bac7e3e8c6533da371828470865218cdb076be4dac07c11bdda0feb7889552d024f1 WHIRLPOOL 2fa4eefd048ffd73becade40aa8269b0d2a94c1e8079af9c0590e4e29f349b4f20cfcb5d5ac345ed7b3daf3047de58b830c665ff07db419d2a639800bbd20a79
diff --git a/dev-haskell/alut/alut-2.4.0.2.ebuild b/dev-haskell/alut/alut-2.4.0.2.ebuild
new file mode 100644
index 000000000000..5a08efda08d5
--- /dev/null
+++ b/dev-haskell/alut/alut-2.4.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -usenativewindowslibraries,buildexamples:examples
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="ALUT"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding for the OpenAL Utility Toolkit"
+HOMEPAGE="https://github.com/haskell-openal/ALUT"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?]
+	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	media-libs/freealut
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples buildexamples) \
+		--flag=-usenativewindowslibraries
+}
diff --git a/dev-haskell/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest
index d40c59198e96..8529d9d83cbe 100644
--- a/dev-haskell/ansi-terminal/Manifest
+++ b/dev-haskell/ansi-terminal/Manifest
@@ -2,4 +2,5 @@ DIST ansi-terminal-0.5.5.1.tar.gz 13132 SHA256 8c0247c0e5dc2089a72575dd5074583a3
 DIST ansi-terminal-0.5.5.tar.gz 13136 SHA256 489565cf36471bdbf38b1b76fc09bce6c311b472d54f09c66546c7592fb52427 SHA512 9fee8511f2edcadf146d1759634592ef725d6e18ccd278ba13cfbd117c918814ae65195237f83b36a96e0b8a89a7731edff2d692138baff9e3473e46d4982ce5 WHIRLPOOL 340c399168bb65af82e5a1b61e2618d0d1977c5efbb834c14a64dea33e6a6927deb466670c14d61e8ff033b4ee5ae3098f758bc8009e37e0f37472803b9ec0d1
 DIST ansi-terminal-0.6.1.1.tar.gz 14169 SHA256 9133a6dc6f99fff3f7d004aa400f4b40424c8999fcd392674d939f2fee65ed1a SHA512 45147b0ea2a7a8121d28e1ecae250a71d2c8bfc1ce7e43dea5dd90b50ee4e6a7e572941b0514750118f9c8b3cbd8175ba3411cb7d1200c68d9b1244bacfa7a6d WHIRLPOOL 5d9eca3f46d200663dfd52858e0bf2040941cbcff58aed7fee962638951f7737f9aef2a6ec02d7297ba8c1ccabc8a6fe820203d123b3f53173adfc436ed4a723
 DIST ansi-terminal-0.6.2.1.tar.gz 14652 SHA256 965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6 SHA512 6a38f6ec13ca2c2669c707eeab1749fa7ca1805fa162cc024867cf0cabb5746c8844bc2188680de3f9dd748cfcb72917b88ac9122ff6b86459c80aa061f2adbf WHIRLPOOL 77777493fb10afce72bfcbcb4c0b0991a892347dcb09792e4fd18c8caef171e854d83cc4ec69c3220e913446f6c8ed3b495e0597350e749b8124d8f2f8b54624
+DIST ansi-terminal-0.6.2.3.tar.gz 21964 SHA256 4dc02cb53e9ca7c8800bbdfc0337b961e5a945382cd09a6a40c6170126e0ee42 SHA512 3d2999d0dcd45950240731ae9bbf5b65fbd5b00660b4f6387afa2e3db89f2f1a6690ea72311348cddd8e27fa31c447f282795c2ae1b76a5306aade785eb3448d WHIRLPOOL b1183fa0cb5d065a383dd7686c745d2365816c4059f299db37d9126f64288c8ff26bc583d878d92d025000f656cae416e6909519f8a50672ef528e26e83bb505
 DIST ansi-terminal-0.6.tar.gz 13165 SHA256 6f3a505ece863f707d069e0bbdc5f99673730dd096a2ca844644660f10cebf28 SHA512 369170e4e3aaf1d67bc8dbf9dec5ea42a4fa71832f3edb4cd5f73b608f5971efb9d8ceac447e482af5d483c19bd8bc6eb7118898ffde16606f986fcca6bd1e14 WHIRLPOOL 27a1c83dd1c45fa3492693409c33fc92948cac20e807d348e17b3e0165f68908d86976d6de3a3a8c39a4ba907f4db2da5eda4a9f8f763fd64b00f46bc5ccbe55
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
new file mode 100644
index 000000000000..ffb9481613b6
--- /dev/null
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
+HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="example"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag example example)
+}
diff --git a/dev-haskell/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
index 3ffbd1ca82c1..d50ec66161fb 100644
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ b/dev-haskell/ansi-wl-pprint/Manifest
@@ -1,3 +1,4 @@
 DIST ansi-wl-pprint-0.6.6.tar.gz 13775 SHA256 1eff90ac153f66c42aa6ee10639e3c541194935030672bac8ff2b5cbca8e6bfe SHA512 5bc47ab71a88c0579d4ff06f54616f6418951215db7d42692c55be6855dc7e190eb71b86331319a80ac1a2ad6762294549cf0629cbf2ec2f46c25047d29c9469 WHIRLPOOL ad357f1e77620d554055aad212cb340d76859fdb371bfb0def99f8623fd9123820afef7d3b3dbec11100f2dcaf00dd2631eff2f8b0034bd4f7323f4588819081
 DIST ansi-wl-pprint-0.6.7.1.tar.gz 14862 SHA256 d980c265cacf6d6aa37a24d056e730b678680e07d3ab87210affb415de0ac1af SHA512 e0524f7ba0e6ba3eefc2c04d0186579c70687c65d672e11b09a6b4352ae51f2b30e9c4a4753ca30840d24c82be8f6faa1183c29a2ee154b8c2485e1c01cad546 WHIRLPOOL 570181028a05370b12042b14df869dd8218aa8c6ec17a1a7b13f5e7074128007bc02120193598c7d8338ece8c78b726483746f664a520cc40e4ad2444fe110af
 DIST ansi-wl-pprint-0.6.7.2.tar.gz 14930 SHA256 015ec4414242089fff5d6d567b392b6bb4fa5f85afff7f0708566082e1d91774 SHA512 e0c1b9c4d3818695cc8640ccbb47a7b9b383c27b3bd9d0dc5e95dd8921d3de537ee7bcb96007e0b44d0c5089e231b3c1c3524784c136d0284f64e4df80ee93c2 WHIRLPOOL 79b3b9152aac18c8a2d40117881dd9e1bb6722a1cb989bb2d43d0a2f73dd6b93d6b98f5510139d9125162746b1cd0e721f8c1eac39a93ca3de925cb3cea0ef57
+DIST ansi-wl-pprint-0.6.7.3.tar.gz 14983 SHA256 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708 SHA512 c5b41ee5890251ff3524bca9d5d0b457b54838906f4145e09e68cf88cb11e7bd59e05ba99c660ad61a9fcfb4e9201be4c916de2a066dfca12922292790590eba WHIRLPOOL a8ff92f22b0ccf4834ba6bdb0dc9d679c25f2a05c19da1f67d963a6ec5c96e08d11bd17dcf4a445bdf43f56a56944ec34d36896e4d72c3ca607c7045079fd293
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
new file mode 100644
index 000000000000..43add2bc953d
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
+HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="example"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag example example)
+}
diff --git a/dev-haskell/asn1-data/Manifest b/dev-haskell/asn1-data/Manifest
index d532e0a64cb4..107cc52932dd 100644
--- a/dev-haskell/asn1-data/Manifest
+++ b/dev-haskell/asn1-data/Manifest
@@ -1 +1,2 @@
 DIST asn1-data-0.7.1.tar.gz 17500 SHA256 f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783 SHA512 dc6021daf15e5f9b93703641780c6d81c6b385d2127bcc2f735ecaf54d1be5163ad5e9ae291a3e223ff05cf03e8bbf11af0791ee810a0ba174e9cc9e9fd910d0 WHIRLPOOL 73a1e7f32c0e98bf52f1641214c6b69ae4336e24e0b0ac08eda04dc48f03085eb1a7c9e3ab2ddea9e25001e1841efb25b70adaefdc23f37130fc69ed8a46bc76
+DIST asn1-data-0.7.2.tar.gz 17672 SHA256 83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1 SHA512 739c2a9e99a978ba5384da5d5ed388554471f2f6e898c9e07f26de6c6d48bbb236d83b6e2281be7ce4d9db6225acb230010393e1cd368ef9cf4f65eddb8e1e38 WHIRLPOOL 7781855dfc295951657d6cc5bfcdfc55e121f56e4bf4e002894ddab911c84e51532652fe45b519eb146814e80ae0f25d23bf3c2dc4d7ef3dd47fc3f11394bcbb
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
new file mode 100644
index 000000000000..afb3e2f209de
--- /dev/null
+++ b/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -test
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/data"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/cereal:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-test
+}
diff --git a/dev-haskell/asn1-encoding/Manifest b/dev-haskell/asn1-encoding/Manifest
index ac28ee66328f..8470fe81227c 100644
--- a/dev-haskell/asn1-encoding/Manifest
+++ b/dev-haskell/asn1-encoding/Manifest
@@ -1,2 +1,3 @@
 DIST asn1-encoding-0.8.1.3.tar.gz 16099 SHA256 d1a26d9e2df6f0c815ff347093b20e06a21feeaee2f9204af7aeb797ba541900 SHA512 be5d97db5904cb71fd99db919a6da8e958b3e0aedaea6bbd21d316fc41dd79852d8567edecb75eb212279a9f6af3d566d3e8aa5f5f22f46a8d9ca0883af64dd9 WHIRLPOOL 62621fb12fddf2e090056c2c37fe76ec751f7fba68906cdaaa0629894ebd7227361439b32c321eee09563a79dad1ff8d6f263134c685d677c9de80d49663e375
 DIST asn1-encoding-0.9.0.tar.gz 15997 SHA256 17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b SHA512 b7693c74ba01d46d93371faa1df14bdef233b8b0fcbd4de0d6a853e41795622e1edc79c278372976454107d97f8a6ba10c44cab2539103796d56b9df4fa4b0ee WHIRLPOOL 3aec02a703169248d1ef4c6b793e4b26576dacb2b0b5c601dc85593f381279eb2469f515ff4f37f4de8c530834907ec552a67b74baea4d4875988f86d05b2df6
+DIST asn1-encoding-0.9.3.tar.gz 16069 SHA256 90d7e05806977e683a468a4112270c9745c07f52452915db6a8fb19b752d7106 SHA512 c6e2f45403504da1740fb581083306ce1fbdaa54f9aa05f5c80a67517ad1d82140fde887cc88e0a6c9b9d778ada2013b6725c4debd1e7522729434b246ce1160 WHIRLPOOL 3b9d79ab47a9b26fe6c2d3dbfe3740ba58ffbb52ddbb41d7bb1da4c1ef446bfc37d38f15acf6e119bec8972f4c89639a8eb3a3589b9ce7f5dc682438971d161f
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild
new file mode 100644
index 000000000000..ab887b0b5bc8
--- /dev/null
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
+HOMEPAGE="http://github.com/vincenthz/hs-asn1"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-haskell/hourglass-0.2.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/mtl
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck
+		dev-haskell/text )
+"
diff --git a/dev-haskell/asn1-parse/Manifest b/dev-haskell/asn1-parse/Manifest
index 0aad4b852860..1449a4d2fab8 100644
--- a/dev-haskell/asn1-parse/Manifest
+++ b/dev-haskell/asn1-parse/Manifest
@@ -1,3 +1,4 @@
 DIST asn1-parse-0.8.1.tar.gz 2724 SHA256 09567b3f06d428a194fe8132acf002f8dbfb8694a113dce14edd79a54a5d3508 SHA512 d175903a4e2eacaf56b3c641c3a78adebfdbe263678a59c0ba44d5c1185408800f1aabad3d0ce622fe1029e204699477b36565df5bd1049ebba0df10f72eb128 WHIRLPOOL bed35b1bb93017bfc3805e48b88b802cd9d829697f9521a84341748b86bf6ff497bbfa8dc0a9ca4974ecf86c825c2ea029155ea3294faa53dcf6ce0900961165
 DIST asn1-parse-0.9.0.tar.gz 2801 SHA256 e3c94b982c34e944c549b7854d738d50158eee0267598ac5f1bbfb66391f0954 SHA512 8c358864b863721d71b0ba45991dddfa0e529bf34fe5483e4904bb56b9e1ff0bd03335f71677eecfb7da96a3d6efe0bfd9ea2684b3c6ba4cd7ab28ab26d2f66a WHIRLPOOL e8e8c0402a6731788361ebf623ca265b53e8db6d00c3eea4849f5e42616e454cb8742f99d9382ffffc0546b73add61901184cdcb2f6a34faa75ce26cdcea80b1
 DIST asn1-parse-0.9.1.tar.gz 2785 SHA256 e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de SHA512 69799adf27188a8b1468cfc35c5a17ffe668aa30f585e8d8ff0b9153936a8825e9d548fca38d8e4ea5823ae511f179c5b56c5fe804260048bd3c5e373a077d17 WHIRLPOOL 6f81e452b09d0f9a3e1a521c3332651130aab042b256aa80a9c35f398ef4f8093946bcc473effb7a53bca36ef26120f979606cebe97e6f5399c2cb6e080ac853
+DIST asn1-parse-0.9.4.tar.gz 2860 SHA256 c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708 SHA512 10579753addf0580d33f2d7d8571bedb3b4ff3d485891dd7db8b75ae09550cbd42ee9d00a452263810079eeb77ec630687b193a6d4b538bfdb683b92c9e64637 WHIRLPOOL c241a58ec243c80bc54e663e12f28f358396f95336541eed61e575bde4cf0fae1513dcf204a6a016500e06c51fb11941911859ed0ca6a33da8e2cde698c7a2e5
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild
new file mode 100644
index 000000000000..94e04a3fcf8f
--- /dev/null
+++ b/dev-haskell/asn1-parse/asn1-parse-0.9.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple monadic parser for ASN1 stream types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/asn1-types/Manifest b/dev-haskell/asn1-types/Manifest
index 024cf38e9bda..51e7d01b2685 100644
--- a/dev-haskell/asn1-types/Manifest
+++ b/dev-haskell/asn1-types/Manifest
@@ -3,3 +3,4 @@ DIST asn1-types-0.2.1.tar.gz 5245 SHA256 79f7529de9137f2708ecf91597f60195698594d
 DIST asn1-types-0.2.2.tar.gz 5385 SHA256 dd2b1880ac43cebc4d42db94dc46498224cd0d1c20d65f11a2bf07e7e3e17c40 SHA512 2c356f4c4a95320b9aef65ae81d9633cd785749d7e4968d70b2804b68bf4781ae98a6589bcd388cdd8af4214008dfd5dbafc25fe2c562a2a2a86b16c4ac09257 WHIRLPOOL 944c3155f7324db33728031b2286201b3c551444f030197c77f1e2f6e6277ff985b1ff50bd2d895feea34ffa211b9f24b723c9ffc53f59662319b9926d5b2f20
 DIST asn1-types-0.2.3.tar.gz 5411 SHA256 84c3778b36978f673fe916b325759ff9ac2294900c052190afd868fa8d84bfb1 SHA512 09074e2fbadd2cb79f8c8cd7fb2d64794d7bcfe09a9eea345b98895ad855ea187fb33882c420a380ee362e61990824d6b365e75ed5fa429d994bd7e0582ddbdf WHIRLPOOL e237ef7f8e38cba70e9a7562f7189e41e938f8964849c53c726cbe5bdc1d6128898feb02e03c8caf991158c24a93dbb7065970d0901e8f3c12459fd2b887ae60
 DIST asn1-types-0.3.0.tar.gz 5391 SHA256 b998dad88b94f8da7058df52f03936d66c81a2d012549c87affeecac5cb5a8aa SHA512 7955320acb2a7801cc268d8cc7bbf2a9c8c127b151d89c1abffd0994f6cecb57979b25612f7efc922c82d9abeb7dc5ff6db2d08e26fdd1c36a6bfcd428b122be WHIRLPOOL bfba3b43d50ec6709b283967ea9820fa3edf01ef1eb9fc72c5d562c74b1b7df63a1117f842332adb4f4d7cc04fe344043281d82c193b335405fdc79220ead615
+DIST asn1-types-0.3.2.tar.gz 6424 SHA256 0c571fff4a10559c6a630d4851ba3cdf1d558185ce3dcfca1136f9883d647217 SHA512 d5eb4c9f4fc44ff06b4d0d4c6be4ad2b43e01478de6ca48d2a78bad69d828f1c48095ccb4542546357f8934141b4c96f156d954072b91f1695ef1536ddc50e08 WHIRLPOOL a5a60f2b8619701a05e2766decb0d2af51b9ad1c257779b069916f07c4aa77a8ca7a164921df60f059118b073a21bac9d06ad6ed8cad7379250b2cf5e76afd92
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild
new file mode 100644
index 000000000000..1d617148fcd2
--- /dev/null
+++ b/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ASN.1 types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1-types"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/auto-update/Manifest b/dev-haskell/auto-update/Manifest
index 39b941d1e99a..0307a88b7846 100644
--- a/dev-haskell/auto-update/Manifest
+++ b/dev-haskell/auto-update/Manifest
@@ -1,2 +1,3 @@
 DIST auto-update-0.1.2.1.tar.gz 6670 SHA256 97d3228ab744ca24b0838a001cb56be24f905e3237581ada800274219cbc4132 SHA512 d5a2513a55a4e5225ce5aa2fcd25f02fd286314d13c9d14e1f72e0ddd413336ae08eb14a1534af2af7bdef4e596a45a4e6cecb5d3bdd44a14c9732da22994235 WHIRLPOOL 782d696075f53304c5aea9a6ed0e9465e6b1200675dd8c96b1aa08af802b54e83196e0c7f791ffcfbc1f28b093d98401c6f42f5156e60791e00cec502439bcb4
 DIST auto-update-0.1.2.2.tar.gz 6651 SHA256 7b3000c330055d4059fe8d9ab044c29e3a57b4dc31b88ea386a75a886b6144db SHA512 40358d82324653b20433041262b13f4491cfa51b58ace9554d292c09f8f0d979aed19244d4d204b34f8a296a259b968a4c3c639650e06adc7057b53057c67a74 WHIRLPOOL 3961da1207ef59b32a3b5834a6df328551ccb0b3d148d5bca8e55ea49fc57b3c0fd54262685a949b2c1d5cfe7f21681f153d33149c566b6065488914582a6eb3
+DIST auto-update-0.1.3.tar.gz 6799 SHA256 3d8e11271d9c0bacefd663143af60c530dd7483b70582bae56e64b6716891509 SHA512 54eb034f75d214d428a2ba4d830e4301d5c4ca0df5c55c54aaa5257bc561c1033a34f4e65c3f64606591f03aff8194b04397ffa298a779a8ee0b46fc7ed32ad3 WHIRLPOOL f691ac0dfa503fcf552dcf36c235a73796e30a42ebfaea6ea8c45fd792cfc312cc5290253479ccfe7148a4fc4af242a4c11d7a1a227fd67eaa532023525d1992
diff --git a/dev-haskell/auto-update/auto-update-0.1.3.ebuild b/dev-haskell/auto-update/auto-update-0.1.3.ebuild
new file mode 100644
index 000000000000..aa1079931c06
--- /dev/null
+++ b/dev-haskell/auto-update/auto-update-0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Efficiently run periodic, on-demand actions"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..ccf731538e55
--- /dev/null
+++ b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Atomic bit operations on memory locations for low-level synchronization"
+HOMEPAGE="http://hackage.haskell.org/package/bits-atomic"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-5.patch
+}
diff --git a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-gcc-5.patch b/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-gcc-5.patch
new file mode 100644
index 000000000000..a500862f6184
--- /dev/null
+++ b/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-gcc-5.patch
@@ -0,0 +1,610 @@
+diff --git a/Setup.hs b/Setup.hs
+index 46f5022..36c3aa9 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1,19 +1,7 @@
+-{-# LANGUAGE CPP #-}
+-import Distribution.Simple
+-import Distribution.PackageDescription
+-import Distribution.Simple.LocalBuildInfo(LocalBuildInfo, buildDir)
+-import System.Cmd(system)
+-
+-ps :: String
+-#if mingw32_HOST_OS || mingw32_TARGET_OS
+-ps = ['\\']
+-#else
+-ps = ['/']
+-#endif
++#!/usr/bin/runhaskell
++module Main where
+ 
+-main = defaultMainWithHooks hooks
+-  where hooks = simpleUserHooks { runTests = runTests' }
++import Distribution.Simple
+ 
+-runTests' :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
+-runTests' _ _ _ lbi = system testprog >> return ()
+-  where testprog = (buildDir lbi) ++ ps ++ "test" ++ ps ++ "test"
++main :: IO ()
++main = defaultMain
+diff --git a/bits-atomic.cabal b/bits-atomic.cabal
+index 68da7f7..97b513f 100644
+--- a/bits-atomic.cabal
++++ b/bits-atomic.cabal
+@@ -43,3 +43,3 @@ Stability:          experimental
+ Build-Type:         Custom
+-Cabal-Version: >= 1.6
++Cabal-Version: >= 1.8
+ Extra-Source-Files: cbits/atomic-bitops-gcc.c cbits/atomic-bitops-gcc.h
+@@ -64,11 +64,6 @@ library
+ 
+-flag test
+-    description: Build test program.
+-    default:     False
+-
+-Executable test
+-    if flag(test)
+-        buildable:  True
+-        build-depends:   
+-                    base >= 4 && < 6, 
++test-suite test
++    Type:                 exitcode-stdio-1.0
++    build-depends:  bits-atomic,
++                    base >= 4 && < 6,
+                     QuickCheck, 
+@@ -78,6 +73,4 @@ Executable test
+                     test-framework
+-    else
+-        buildable:  False
+-    hs-source-dirs:  ., test
+-    other-modules:   Data.Bits.Atomic
++
++    hs-source-dirs:  test
+     main-is:         test.hs
+@@ -85,4 +78 @@ Executable test
+     GHC-Prof-Options: -auto-all
+-
+-    Include-Dirs:     cbits
+-    C-Sources:        cbits/atomic-bitops-gcc.c
+diff --git a/cbits/atomic-bitops-gcc.c b/cbits/atomic-bitops-gcc.c
+index 3f9d4ef..96ed076 100644
+--- a/cbits/atomic-bitops-gcc.c
++++ b/cbits/atomic-bitops-gcc.c
+@@ -5,39 +5,39 @@ void mem_barrier (void) {return __sync_synchronize ();}
+ /* 8-bit */
+-inline unsigned char fetch_and_add_8 (unsigned char *p, unsigned char v) {
++unsigned char fetch_and_add_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_fetch_and_add (p, v);
+ }
+-inline unsigned char fetch_and_sub_8 (unsigned char *p, unsigned char v) {
++unsigned char fetch_and_sub_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_fetch_and_sub (p, v);
+ }
+-inline unsigned char fetch_and_or_8 (unsigned char *p, unsigned char v) {
++unsigned char fetch_and_or_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_fetch_and_or (p, v);
+ }
+-inline unsigned char fetch_and_and_8 (unsigned char *p, unsigned char v) {
++unsigned char fetch_and_and_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_fetch_and_and (p, v);
+ }
+-inline unsigned char fetch_and_xor_8 (unsigned char *p, unsigned char v) {
++unsigned char fetch_and_xor_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_fetch_and_xor (p, v);
+ }
+-inline unsigned char fetch_and_nand_8 (unsigned char *p, unsigned char v) {
++unsigned char fetch_and_nand_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_fetch_and_nand (p, v);
+ }
+-inline unsigned char add_and_fetch_8 (unsigned char *p, unsigned char v) {
++unsigned char add_and_fetch_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_add_and_fetch (p, v);
+ }
+-inline unsigned char sub_and_fetch_8 (unsigned char *p, unsigned char v) {
++unsigned char sub_and_fetch_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_sub_and_fetch (p, v);
+ }
+-inline unsigned char or_and_fetch_8 (unsigned char *p, unsigned char v) {
++unsigned char or_and_fetch_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_or_and_fetch (p, v);
+ }
+-inline unsigned char and_and_fetch_8 (unsigned char *p, unsigned char v) {
++unsigned char and_and_fetch_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_and_and_fetch (p, v);
+ }
+-inline unsigned char xor_and_fetch_8 (unsigned char *p, unsigned char v) {
++unsigned char xor_and_fetch_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_xor_and_fetch (p, v);
+ }
+-inline unsigned char nand_and_fetch_8 (unsigned char *p, unsigned char v) {
++unsigned char nand_and_fetch_8 (unsigned char *p, unsigned char v) {
+ 	return __sync_nand_and_fetch (p, v);
+ }
+-inline unsigned int
++unsigned int
+ bool_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new) {
+@@ -45,3 +45,3 @@ bool_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new)
+ }
+-inline unsigned char
++unsigned char
+ val_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new) {
+@@ -49,3 +49,3 @@ val_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new)
+ }
+-inline unsigned char lock_test_and_set_8 (unsigned char *p) {
++unsigned char lock_test_and_set_8 (unsigned char *p) {
+ 	// Only immediate 0/1 appear to be widely supported, so hardcode it
+@@ -60,39 +60,39 @@ void lock_release_8 (unsigned char *p) {
+ /* 16-bit */
+-inline unsigned short fetch_and_add_16 (unsigned short *p, unsigned short v) {
++unsigned short fetch_and_add_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_fetch_and_add (p, v);
+ }
+-inline unsigned short fetch_and_sub_16 (unsigned short *p, unsigned short v) {
++unsigned short fetch_and_sub_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_fetch_and_sub (p, v);
+ }
+-inline unsigned short fetch_and_or_16 (unsigned short *p, unsigned short v) {
++unsigned short fetch_and_or_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_fetch_and_or (p, v);
+ }
+-inline unsigned short fetch_and_and_16 (unsigned short *p, unsigned short v) {
++unsigned short fetch_and_and_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_fetch_and_and (p, v);
+ }
+-inline unsigned short fetch_and_xor_16 (unsigned short *p, unsigned short v) {
++unsigned short fetch_and_xor_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_fetch_and_xor (p, v);
+ }
+-inline unsigned short fetch_and_nand_16 (unsigned short *p, unsigned short v) {
++unsigned short fetch_and_nand_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_fetch_and_nand (p, v);
+ }
+-inline unsigned short add_and_fetch_16 (unsigned short *p, unsigned short v) {
++unsigned short add_and_fetch_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_add_and_fetch (p, v);
+ }
+-inline unsigned short sub_and_fetch_16 (unsigned short *p, unsigned short v) {
++unsigned short sub_and_fetch_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_sub_and_fetch (p, v);
+ }
+-inline unsigned short or_and_fetch_16 (unsigned short *p, unsigned short v) {
++unsigned short or_and_fetch_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_or_and_fetch (p, v);
+ }
+-inline unsigned short and_and_fetch_16 (unsigned short *p, unsigned short v) {
++unsigned short and_and_fetch_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_and_and_fetch (p, v);
+ }
+-inline unsigned short xor_and_fetch_16 (unsigned short *p, unsigned short v) {
++unsigned short xor_and_fetch_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_xor_and_fetch (p, v);
+ }
+-inline unsigned short nand_and_fetch_16 (unsigned short *p, unsigned short v) {
++unsigned short nand_and_fetch_16 (unsigned short *p, unsigned short v) {
+ 	return __sync_nand_and_fetch (p, v);
+ }
+-inline unsigned int
++unsigned int
+ bool_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short new) {
+@@ -100,3 +100,3 @@ bool_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short
+ }
+-inline unsigned short
++unsigned short
+ val_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short new) {
+@@ -104,3 +104,3 @@ val_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short n
+ }
+-inline unsigned short lock_test_and_set_16 (unsigned short *p) {
++unsigned short lock_test_and_set_16 (unsigned short *p) {
+ 	// Only immediate 0/1 appear to be widely supported, so hardcode it
+@@ -115,39 +115,39 @@ void lock_release_16 (unsigned short *p) {
+ /* 32-bit */
+-inline unsigned int fetch_and_add_32 (unsigned int *p, unsigned int v) {
++unsigned int fetch_and_add_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_fetch_and_add (p, v);
+ }
+-inline unsigned int fetch_and_sub_32 (unsigned int *p, unsigned int v) {
++unsigned int fetch_and_sub_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_fetch_and_sub (p, v);
+ }
+-inline unsigned int fetch_and_or_32 (unsigned int *p, unsigned int v) {
++unsigned int fetch_and_or_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_fetch_and_or (p, v);
+ }
+-inline unsigned int fetch_and_and_32 (unsigned int *p, unsigned int v) {
++unsigned int fetch_and_and_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_fetch_and_and (p, v);
+ }
+-inline unsigned int fetch_and_xor_32 (unsigned int *p, unsigned int v) {
++unsigned int fetch_and_xor_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_fetch_and_xor (p, v);
+ }
+-inline unsigned int fetch_and_nand_32 (unsigned int *p, unsigned int v) {
++unsigned int fetch_and_nand_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_fetch_and_nand (p, v);
+ }
+-inline unsigned int add_and_fetch_32 (unsigned int *p, unsigned int v) {
++unsigned int add_and_fetch_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_add_and_fetch (p, v);
+ }
+-inline unsigned int sub_and_fetch_32 (unsigned int *p, unsigned int v) {
++unsigned int sub_and_fetch_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_sub_and_fetch (p, v);
+ }
+-inline unsigned int or_and_fetch_32 (unsigned int *p, unsigned int v) {
++unsigned int or_and_fetch_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_or_and_fetch (p, v);
+ }
+-inline unsigned int and_and_fetch_32 (unsigned int *p, unsigned int v) {
++unsigned int and_and_fetch_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_and_and_fetch (p, v);
+ }
+-inline unsigned int xor_and_fetch_32 (unsigned int *p, unsigned int v) {
++unsigned int xor_and_fetch_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_xor_and_fetch (p, v);
+ }
+-inline unsigned int nand_and_fetch_32 (unsigned int *p, unsigned int v) {
++unsigned int nand_and_fetch_32 (unsigned int *p, unsigned int v) {
+ 	return __sync_nand_and_fetch (p, v);
+ }
+-inline unsigned int
++unsigned int
+ bool_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
+@@ -155,3 +155,3 @@ bool_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
+ }
+-inline unsigned int
++unsigned int
+ val_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
+@@ -159,3 +159,3 @@ val_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
+ }
+-inline unsigned int lock_test_and_set_32 (unsigned int *p) {
++unsigned int lock_test_and_set_32 (unsigned int *p) {
+ 	// Only immediate 0/1 appear to be widely supported, so hardcode it
+@@ -170,39 +170,39 @@ void lock_release_32 (unsigned int *p) {
+ /* 64-bit */
+-inline unsigned long long fetch_and_add_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long fetch_and_add_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_fetch_and_add (p, v);
+ }
+-inline unsigned long long fetch_and_sub_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long fetch_and_sub_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_fetch_and_sub (p, v);
+ }
+-inline unsigned long long fetch_and_or_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long fetch_and_or_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_fetch_and_or (p, v);
+ }
+-inline unsigned long long fetch_and_and_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long fetch_and_and_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_fetch_and_and (p, v);
+ }
+-inline unsigned long long fetch_and_xor_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long fetch_and_xor_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_fetch_and_xor (p, v);
+ }
+-inline unsigned long long fetch_and_nand_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long fetch_and_nand_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_fetch_and_nand (p, v);
+ }
+-inline unsigned long long add_and_fetch_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long add_and_fetch_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_add_and_fetch (p, v);
+ }
+-inline unsigned long long sub_and_fetch_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long sub_and_fetch_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_sub_and_fetch (p, v);
+ }
+-inline unsigned long long or_and_fetch_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long or_and_fetch_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_or_and_fetch (p, v);
+ }
+-inline unsigned long long and_and_fetch_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long and_and_fetch_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_and_and_fetch (p, v);
+ }
+-inline unsigned long long xor_and_fetch_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long xor_and_fetch_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_xor_and_fetch (p, v);
+ }
+-inline unsigned long long nand_and_fetch_64 (unsigned long long *p, unsigned long long v) {
++unsigned long long nand_and_fetch_64 (unsigned long long *p, unsigned long long v) {
+ 	return __sync_nand_and_fetch (p, v);
+ }
+-inline unsigned int
++unsigned int
+ bool_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigned long long new) {
+@@ -210,3 +210,3 @@ bool_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigne
+ }
+-inline unsigned long long
++unsigned long long
+ val_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigned long long new) {
+@@ -214,3 +214,3 @@ val_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigned
+ }
+-inline unsigned long long lock_test_and_set_64 (unsigned long long *p) {
++unsigned long long lock_test_and_set_64 (unsigned long long *p) {
+ 	// Only immediate 0/1 appear to be widely supported, so hardcode it
+@@ -225,39 +225,39 @@ void lock_release_64 (unsigned long long *p) {
+ /* Word-sized */
+-inline unsigned long fetch_and_add_word (unsigned long *p, unsigned long v) {
++unsigned long fetch_and_add_word (unsigned long *p, unsigned long v) {
+ 	return __sync_fetch_and_add (p, v);
+ }
+-inline unsigned long fetch_and_sub_word (unsigned long *p, unsigned long v) {
++unsigned long fetch_and_sub_word (unsigned long *p, unsigned long v) {
+ 	return __sync_fetch_and_sub (p, v);
+ }
+-inline unsigned long fetch_and_or_word (unsigned long *p, unsigned long v) {
++unsigned long fetch_and_or_word (unsigned long *p, unsigned long v) {
+ 	return __sync_fetch_and_or (p, v);
+ }
+-inline unsigned long fetch_and_and_word (unsigned long *p, unsigned long v) {
++unsigned long fetch_and_and_word (unsigned long *p, unsigned long v) {
+ 	return __sync_fetch_and_and (p, v);
+ }
+-inline unsigned long fetch_and_xor_word (unsigned long *p, unsigned long v) {
++unsigned long fetch_and_xor_word (unsigned long *p, unsigned long v) {
+ 	return __sync_fetch_and_xor (p, v);
+ }
+-inline unsigned long fetch_and_nand_word (unsigned long *p, unsigned long v) {
++unsigned long fetch_and_nand_word (unsigned long *p, unsigned long v) {
+ 	return __sync_fetch_and_nand (p, v);
+ }
+-inline unsigned long add_and_fetch_word (unsigned long *p, unsigned long v) {
++unsigned long add_and_fetch_word (unsigned long *p, unsigned long v) {
+ 	return __sync_add_and_fetch (p, v);
+ }
+-inline unsigned long sub_and_fetch_word (unsigned long *p, unsigned long v) {
++unsigned long sub_and_fetch_word (unsigned long *p, unsigned long v) {
+ 	return __sync_sub_and_fetch (p, v);
+ }
+-inline unsigned long or_and_fetch_word (unsigned long *p, unsigned long v) {
++unsigned long or_and_fetch_word (unsigned long *p, unsigned long v) {
+ 	return __sync_or_and_fetch (p, v);
+ }
+-inline unsigned long and_and_fetch_word (unsigned long *p, unsigned long v) {
++unsigned long and_and_fetch_word (unsigned long *p, unsigned long v) {
+ 	return __sync_and_and_fetch (p, v);
+ }
+-inline unsigned long xor_and_fetch_word (unsigned long *p, unsigned long v) {
++unsigned long xor_and_fetch_word (unsigned long *p, unsigned long v) {
+ 	return __sync_xor_and_fetch (p, v);
+ }
+-inline unsigned long nand_and_fetch_word (unsigned long *p, unsigned long v) {
++unsigned long nand_and_fetch_word (unsigned long *p, unsigned long v) {
+ 	return __sync_nand_and_fetch (p, v);
+ }
+-inline unsigned int
++unsigned int
+ bool_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long new) {
+@@ -265,3 +265,3 @@ bool_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long n
+ }
+-inline unsigned long
++unsigned long
+ val_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long new) {
+@@ -269,3 +269,3 @@ val_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long ne
+ }
+-inline unsigned long lock_test_and_set_word (unsigned long *p) {
++unsigned long lock_test_and_set_word (unsigned long *p) {
+ 	// Only immediate 0/1 appear to be widely supported, so hardcode it
+diff --git a/cbits/atomic-bitops-gcc.h b/cbits/atomic-bitops-gcc.h
+index f9eccc4..7e0ef15 100644
+--- a/cbits/atomic-bitops-gcc.h
++++ b/cbits/atomic-bitops-gcc.h
+@@ -6,19 +6,19 @@ void mem_barrier (void);
+ /* 8-bit */
+-inline unsigned char fetch_and_add_8 (unsigned char *, unsigned char );
+-inline unsigned char fetch_and_sub_8 (unsigned char *, unsigned char );
+-inline unsigned char fetch_and_or_8 (unsigned char *, unsigned char );
+-inline unsigned char fetch_and_and_8 (unsigned char *, unsigned char );
+-inline unsigned char fetch_and_xor_8 (unsigned char *, unsigned char );
+-inline unsigned char fetch_and_nand_8 (unsigned char *, unsigned char );
+-inline unsigned char add_and_fetch_8 (unsigned char *, unsigned char );
+-inline unsigned char sub_and_fetch_8 (unsigned char *, unsigned char );
+-inline unsigned char or_and_fetch_8 (unsigned char *, unsigned char );
+-inline unsigned char and_and_fetch_8 (unsigned char *, unsigned char );
+-inline unsigned char xor_and_fetch_8 (unsigned char *, unsigned char );
+-inline unsigned char nand_and_fetch_8 (unsigned char *, unsigned char );
+-inline unsigned int
++unsigned char fetch_and_add_8 (unsigned char *, unsigned char );
++unsigned char fetch_and_sub_8 (unsigned char *, unsigned char );
++unsigned char fetch_and_or_8 (unsigned char *, unsigned char );
++unsigned char fetch_and_and_8 (unsigned char *, unsigned char );
++unsigned char fetch_and_xor_8 (unsigned char *, unsigned char );
++unsigned char fetch_and_nand_8 (unsigned char *, unsigned char );
++unsigned char add_and_fetch_8 (unsigned char *, unsigned char );
++unsigned char sub_and_fetch_8 (unsigned char *, unsigned char );
++unsigned char or_and_fetch_8 (unsigned char *, unsigned char );
++unsigned char and_and_fetch_8 (unsigned char *, unsigned char );
++unsigned char xor_and_fetch_8 (unsigned char *, unsigned char );
++unsigned char nand_and_fetch_8 (unsigned char *, unsigned char );
++unsigned int
+ bool_compare_and_swap_8 (unsigned char *, unsigned char, unsigned char);
+-inline unsigned char
++unsigned char
+ val_compare_and_swap_8 (unsigned char *, unsigned char , unsigned char);
+-inline unsigned char lock_test_and_set_8 (unsigned char *);
++unsigned char lock_test_and_set_8 (unsigned char *);
+ void lock_release_8 (unsigned char *);
+@@ -26,19 +26,19 @@ void lock_release_8 (unsigned char *);
+ /* 16-bit */
+-inline unsigned short fetch_and_add_16 (unsigned short *, unsigned short );
+-inline unsigned short fetch_and_sub_16 (unsigned short *, unsigned short );
+-inline unsigned short fetch_and_or_16 (unsigned short *, unsigned short );
+-inline unsigned short fetch_and_and_16 (unsigned short *, unsigned short );
+-inline unsigned short fetch_and_xor_16 (unsigned short *, unsigned short );
+-inline unsigned short fetch_and_nand_16 (unsigned short *, unsigned short );
+-inline unsigned short add_and_fetch_16 (unsigned short *, unsigned short );
+-inline unsigned short sub_and_fetch_16 (unsigned short *, unsigned short );
+-inline unsigned short or_and_fetch_16 (unsigned short *, unsigned short );
+-inline unsigned short and_and_fetch_16 (unsigned short *, unsigned short );
+-inline unsigned short xor_and_fetch_16 (unsigned short *, unsigned short );
+-inline unsigned short nand_and_fetch_16 (unsigned short *, unsigned short );
+-inline unsigned int
++unsigned short fetch_and_add_16 (unsigned short *, unsigned short );
++unsigned short fetch_and_sub_16 (unsigned short *, unsigned short );
++unsigned short fetch_and_or_16 (unsigned short *, unsigned short );
++unsigned short fetch_and_and_16 (unsigned short *, unsigned short );
++unsigned short fetch_and_xor_16 (unsigned short *, unsigned short );
++unsigned short fetch_and_nand_16 (unsigned short *, unsigned short );
++unsigned short add_and_fetch_16 (unsigned short *, unsigned short );
++unsigned short sub_and_fetch_16 (unsigned short *, unsigned short );
++unsigned short or_and_fetch_16 (unsigned short *, unsigned short );
++unsigned short and_and_fetch_16 (unsigned short *, unsigned short );
++unsigned short xor_and_fetch_16 (unsigned short *, unsigned short );
++unsigned short nand_and_fetch_16 (unsigned short *, unsigned short );
++unsigned int
+ bool_compare_and_swap_16 (unsigned short *, unsigned short , unsigned short );
+-inline unsigned short
++unsigned short
+ val_compare_and_swap_16 (unsigned short *, unsigned short , unsigned short );
+-inline unsigned short lock_test_and_set_16 (unsigned short *);
++unsigned short lock_test_and_set_16 (unsigned short *);
+ void lock_release_16 (unsigned short *);
+@@ -47,19 +47,19 @@ void lock_release_16 (unsigned short *);
+ /* 32-bit */
+-inline unsigned int fetch_and_add_32 (unsigned int *, unsigned int );
+-inline unsigned int fetch_and_sub_32 (unsigned int *, unsigned int );
+-inline unsigned int fetch_and_or_32 (unsigned int *, unsigned int );
+-inline unsigned int fetch_and_and_32 (unsigned int *, unsigned int );
+-inline unsigned int fetch_and_xor_32 (unsigned int *, unsigned int );
+-inline unsigned int fetch_and_nand_32 (unsigned int *, unsigned int );
+-inline unsigned int add_and_fetch_32 (unsigned int *, unsigned int );
+-inline unsigned int sub_and_fetch_32 (unsigned int *, unsigned int );
+-inline unsigned int or_and_fetch_32 (unsigned int *, unsigned int );
+-inline unsigned int and_and_fetch_32 (unsigned int *, unsigned int );
+-inline unsigned int xor_and_fetch_32 (unsigned int *, unsigned int );
+-inline unsigned int nand_and_fetch_32 (unsigned int *, unsigned int );
+-inline unsigned int
++unsigned int fetch_and_add_32 (unsigned int *, unsigned int );
++unsigned int fetch_and_sub_32 (unsigned int *, unsigned int );
++unsigned int fetch_and_or_32 (unsigned int *, unsigned int );
++unsigned int fetch_and_and_32 (unsigned int *, unsigned int );
++unsigned int fetch_and_xor_32 (unsigned int *, unsigned int );
++unsigned int fetch_and_nand_32 (unsigned int *, unsigned int );
++unsigned int add_and_fetch_32 (unsigned int *, unsigned int );
++unsigned int sub_and_fetch_32 (unsigned int *, unsigned int );
++unsigned int or_and_fetch_32 (unsigned int *, unsigned int );
++unsigned int and_and_fetch_32 (unsigned int *, unsigned int );
++unsigned int xor_and_fetch_32 (unsigned int *, unsigned int );
++unsigned int nand_and_fetch_32 (unsigned int *, unsigned int );
++unsigned int
+ bool_compare_and_swap_32 (unsigned int *, unsigned int , unsigned int );
+-inline unsigned int
++unsigned int
+ val_compare_and_swap_32 (unsigned int *, unsigned int , unsigned int );
+-inline unsigned int lock_test_and_set_32 (unsigned int *);
++unsigned int lock_test_and_set_32 (unsigned int *);
+ void lock_release_32 (unsigned int *);
+@@ -67,19 +67,19 @@ void lock_release_32 (unsigned int *);
+ /* 64-bit */
+-inline unsigned long long fetch_and_add_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long fetch_and_sub_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long fetch_and_or_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long fetch_and_and_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long fetch_and_xor_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long fetch_and_nand_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long add_and_fetch_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long sub_and_fetch_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long or_and_fetch_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long and_and_fetch_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long xor_and_fetch_64 (unsigned long long *, unsigned long long );
+-inline unsigned long long nand_and_fetch_64 (unsigned long long *, unsigned long long );
+-inline unsigned int
++unsigned long long fetch_and_add_64 (unsigned long long *, unsigned long long );
++unsigned long long fetch_and_sub_64 (unsigned long long *, unsigned long long );
++unsigned long long fetch_and_or_64 (unsigned long long *, unsigned long long );
++unsigned long long fetch_and_and_64 (unsigned long long *, unsigned long long );
++unsigned long long fetch_and_xor_64 (unsigned long long *, unsigned long long );
++unsigned long long fetch_and_nand_64 (unsigned long long *, unsigned long long );
++unsigned long long add_and_fetch_64 (unsigned long long *, unsigned long long );
++unsigned long long sub_and_fetch_64 (unsigned long long *, unsigned long long );
++unsigned long long or_and_fetch_64 (unsigned long long *, unsigned long long );
++unsigned long long and_and_fetch_64 (unsigned long long *, unsigned long long );
++unsigned long long xor_and_fetch_64 (unsigned long long *, unsigned long long );
++unsigned long long nand_and_fetch_64 (unsigned long long *, unsigned long long );
++unsigned int
+ bool_compare_and_swap_64 (unsigned long long *, unsigned long long , unsigned long long );
+-inline unsigned long long
++unsigned long long
+ val_compare_and_swap_64 (unsigned long long *, unsigned long long , unsigned long long );
+-inline unsigned long long lock_test_and_set_64 (unsigned long long *);
++unsigned long long lock_test_and_set_64 (unsigned long long *);
+ void lock_release_64 (unsigned long long *);
+@@ -87,19 +87,19 @@ void lock_release_64 (unsigned long long *);
+ /* Word */
+-inline unsigned long fetch_and_add_word (unsigned long *, unsigned long );
+-inline unsigned long fetch_and_sub_word (unsigned long *, unsigned long );
+-inline unsigned long fetch_and_or_word (unsigned long *, unsigned long );
+-inline unsigned long fetch_and_and_word (unsigned long *, unsigned long );
+-inline unsigned long fetch_and_xor_word (unsigned long *, unsigned long );
+-inline unsigned long fetch_and_nand_word (unsigned long *, unsigned long );
+-inline unsigned long add_and_fetch_word (unsigned long *, unsigned long );
+-inline unsigned long sub_and_fetch_word (unsigned long *, unsigned long );
+-inline unsigned long or_and_fetch_word (unsigned long *, unsigned long );
+-inline unsigned long and_and_fetch_word (unsigned long *, unsigned long );
+-inline unsigned long xor_and_fetch_word (unsigned long *, unsigned long );
+-inline unsigned long nand_and_fetch_word (unsigned long *, unsigned long );
+-inline unsigned int
++unsigned long fetch_and_add_word (unsigned long *, unsigned long );
++unsigned long fetch_and_sub_word (unsigned long *, unsigned long );
++unsigned long fetch_and_or_word (unsigned long *, unsigned long );
++unsigned long fetch_and_and_word (unsigned long *, unsigned long );
++unsigned long fetch_and_xor_word (unsigned long *, unsigned long );
++unsigned long fetch_and_nand_word (unsigned long *, unsigned long );
++unsigned long add_and_fetch_word (unsigned long *, unsigned long );
++unsigned long sub_and_fetch_word (unsigned long *, unsigned long );
++unsigned long or_and_fetch_word (unsigned long *, unsigned long );
++unsigned long and_and_fetch_word (unsigned long *, unsigned long );
++unsigned long xor_and_fetch_word (unsigned long *, unsigned long );
++unsigned long nand_and_fetch_word (unsigned long *, unsigned long );
++unsigned int
+ bool_compare_and_swap_word (unsigned long *, unsigned long , unsigned long );
+-inline unsigned long
++unsigned long
+ val_compare_and_swap_word (unsigned long *, unsigned long , unsigned long );
+-inline unsigned long lock_test_and_set_word (unsigned long *);
++unsigned long lock_test_and_set_word (unsigned long *);
+ void lock_release_word (unsigned long *);
+diff --git a/test/test.hs b/test/test.hs
+index 8cf3cb2..38238b5 100644
+--- a/test/test.hs
++++ b/test/test.hs
+@@ -35,3 +35,3 @@ testPattern = 0xdeadbeef
+ 
+-type PolyTest = (AtomicBits a, Storable a, Integral a, Bounded a) => a -> Assertion
++type PolyTest = (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
+ 
+@@ -50,3 +50,3 @@ testTypes _test = do
+ 
+-test_compareAndSwap :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
++test_compareAndSwap :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => 
+              a -> Assertion
+@@ -65,3 +65,3 @@ test_compareAndSwap_all = testTypes test_compareAndSwap
+ 
+-test_compareAndSwapBool :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
++test_compareAndSwapBool :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => 
+              a -> Assertion
+@@ -80,3 +80,3 @@ test_compareAndSwapBool_all = testTypes test_compareAndSwapBool
+ 
+-test_fetchAndAdd :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
++test_fetchAndAdd :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => 
+                  a -> Assertion
+@@ -98,3 +98,3 @@ test_fetchAndAdd_all = testTypes test_fetchAndAdd
+ 
+-test_fetchAndSub :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
++test_fetchAndSub :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => 
+                  a -> Assertion
+@@ -115,3 +115,3 @@ test_fetchAndSub_all = testTypes test_fetchAndSub
+ 
+-test_fetchAndXor :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
++test_fetchAndXor :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => 
+                  a -> Assertion
+@@ -127,3 +127,3 @@ test_fetchAndXor_all = testTypes test_fetchAndXor
+ 
+-test_subAndFetch :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
++test_subAndFetch :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => 
+                  a -> Assertion
+@@ -140,3 +140,3 @@ test_subAndFetch_all = testTypes test_subAndFetch
+ 
+-test_lockTestRelease :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
++test_lockTestRelease :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => 
+                  a -> Assertion
diff --git a/dev-haskell/blaze-html/Manifest b/dev-haskell/blaze-html/Manifest
index b285f40aa476..3000739c3e7a 100644
--- a/dev-haskell/blaze-html/Manifest
+++ b/dev-haskell/blaze-html/Manifest
@@ -3,3 +3,4 @@ DIST blaze-html-0.6.1.3.tar.gz 75658 SHA256 58154cc9daeccfb487dcd8d93951e6f5cc1d
 DIST blaze-html-0.7.0.3.tar.gz 75845 SHA256 7d1bba5fac7c129538c567291d5e37663034a9bce6e8efcbea2e8ed5f3dec3ca SHA512 bbcc7acce5aed410cbc4c3fbf8641a92100459c6340c0ff9d616cbd3d11eb1e8f6769d90ce8db6b197ab408c2ff926a6c0475f6c50eee1da3a49274c2fdd4833 WHIRLPOOL f6331446467a636e05e7de03b42b530b786fb0da413e8f2cf2e5b677603d206508855de84fb5ae8e8b00b3acde279437d8f24ee62a75afa9524af0253dce9a66
 DIST blaze-html-0.7.1.0.tar.gz 75872 SHA256 4a92c1654ff0e5236380a9ee48b6b5322c32a0da29913cbadf3f369866f43b4f SHA512 efc007089172b57493b0640e1484706f7b206ac9803699b0c8f5f6f74e74482dfc555d4a0e828fc2809d47b6015020268805b38109890f063b51c9f91d521896 WHIRLPOOL a56fad1388830bbf2766d880190b4d252c4db5db29c61b9999e144840a66ef29d3c8edd4df4323d15e4fe050aa9d4630855e848af8b4b6ec0afbc4adc477796e
 DIST blaze-html-0.8.1.0.tar.gz 76151 SHA256 fb6dc0755b578928538e867ba441525d7169fcfeaabbfc4663f06bc91b6fed31 SHA512 bdb046d04adcef20305d8caf3121daa250437e3eb7adff393e8ede59ec10ecd70a8c37b60702b56627408327eb32e07108e9495b26e8a8de6d7ff6e041c87ac9 WHIRLPOOL bd1148ba4a042d90f66580b449cdc24a5f4cb99f193a89aaf8a6ad1505c26574293b3b354143a0ed673c5c388454ed5c4427f978fdc47242081f5a364e7c23ce
+DIST blaze-html-0.8.1.1.tar.gz 76157 SHA256 f8d2e39764b318f5dde33288f9f11a125ac51552c48b981e2b8068002728dcb6 SHA512 0af9754c5cfd25757c5f1b8514ee37cecdd77a6397f513f6d4b6be301308c11c64d8649d2cc3e9d7ffb85cc9d9fcf18193a8bdf9e19466a6895243c4c338af91 WHIRLPOOL 4432b189116c14b63096aa03175ea9127c7234b57191a180ef5cce1515140010b76bc93eb7cd69a342c41a6c1bfe134659be97d8bda518a94369a25e5a22fa2d
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
new file mode 100644
index 000000000000..a8753f02eb8e
--- /dev/null
+++ b/dev-haskell/blaze-html/blaze-html-0.8.1.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
+HOMEPAGE="http://jaspervdj.be/blaze"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/blaze-markup/Manifest b/dev-haskell/blaze-markup/Manifest
index 914636ca2665..eaccd6f29e38 100644
--- a/dev-haskell/blaze-markup/Manifest
+++ b/dev-haskell/blaze-markup/Manifest
@@ -2,3 +2,4 @@ DIST blaze-markup-0.5.1.6.tar.gz 11903 SHA256 75c35c6ea65ae19ff77f5a994e8e2f3b5b
 DIST blaze-markup-0.5.2.1.tar.gz 12069 SHA256 be69bf07e7dbb439a079cfcac70a449edd90f52cd6ace19aeecb4970304a38b7 SHA512 ef59c658244ff29ac58a7855fa9e011acc719e0d0cc217c26e4f8bbaa48efeb69defda02761685cf0f93d80269e64afc86047c005b129cb3dfe281e7122927e0 WHIRLPOOL c85a1d762d1a88a91b73473bd7a948ece6df0f5d597908f215dfc05b2c6caf76b65394886b96f5e0ea92f0efc4bafefa6b8bde193e67d97042db597566d5c00e
 DIST blaze-markup-0.6.3.0.tar.gz 13348 SHA256 94422d41f9760e4fee5f689950e86401f3e2faf1935cbf56375a2674a93c05f4 SHA512 01ce41593242ddd6effa4ee2edecf461f434992b85fd79e1df8bd766a5879bda545842ea84d30f0513035fc686aeb624373a1de2377d1f5cad52cc1482acc318 WHIRLPOOL 4b8c4801e25fe8bbd7b2fa5dbacf697bb97e29885b98048beed194a5560527dbac83b9dd0769e3ae11170bf0a220d670ee9b3d43616f102be32c180919553930
 DIST blaze-markup-0.7.0.2.tar.gz 13440 SHA256 e4068a284834d8fe68df5ec63a037b92b7c956a82c0c72d7beca8d670fd5725c SHA512 dba4e67555029d7db019b484a9adbcc0bdb95887cacc7febfdae458fc5fae3b02914c1d4f99c208ef00e8665962aa68f36dbc74b13b6f1df7588f4d1b1ffa150 WHIRLPOOL 78904e7a4533167f1294d5042b9d15dc8649d77863bcfbadb0977ab5ce469e859f891c31514383c390e1c1cc8e7b6eb86f74c0341fea6981f0f391b620089314
+DIST blaze-markup-0.7.0.3.tar.gz 13447 SHA256 3e69a0e88dde5a6a3c8b4204d847a545f7872025a2ac4554cd5df2861aa41b20 SHA512 295188911304f32addd19ae8df5f69502cad65a09778c65fede6eb167842508769dae5a0b7eef7451fbcc767d3a0079484a3ed8d2caaa9a841fecc6d5dc4d482 WHIRLPOOL 3bdb662549467473d9f184ed384a9254d941383de71ee37277b8db928ee4ed311e8c6466b50fbb664e280a5fa3051ab8027b1ab8f37739f3284fcfc83d97a6e7
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
new file mode 100644
index 000000000000..e4c72824f307
--- /dev/null
+++ b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast markup combinator library for Haskell"
+HOMEPAGE="http://jaspervdj.be/blaze"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index f1826aa0101f..9a5726a42a58 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -4,3 +4,4 @@ DIST c2hs-0.16.5.tar.gz 137294 SHA256 1e55b42f1648fbbee290d9316fa7954b40e3b27e33
 DIST c2hs-0.17.2.tar.gz 167739 SHA256 b32ff232cf59d41ed875579400f95661bf5a194b94ccf4ea935315df7e0433f7 SHA512 19ef7a589a1700af2e2f2426b43b454ab49467a97d85c3731da77a9b163709d09e4e58b31d13c0127b807764cff7c62c2b8675cf36d91198d83a9ea9ed4c402c WHIRLPOOL 6147e23ff291b7ce2865c65a09aa57955af62acb899d9a091c911a721e3356a7ceda82b113262091437ce969d5311f7bf690ecde63edeb2afc4ab5d64e0a42fe
 DIST c2hs-0.20.1.tar.gz 184115 SHA256 70d8d9a55bc0c68c1315bd98327825503ffa52c153611e2d2d4dfe1cfb4f5cf0 SHA512 fe22257b6003d9133b7f0264c19070eee10200452f783a5c6f36eda44b96d80e5e728d91bca8349461c69de5ae93af3a9bbd67e67c30a182543ee3c79889c51a WHIRLPOOL 5bc4ba885060ac8bd5b6f8cfc06cc8af550441d9cc43b71105e00035a635d956be78d437ff04cf4899f257830950f19ad5fe676f9ddb16ff6d1f45c6a7ec2586
 DIST c2hs-0.25.2.tar.gz 198733 SHA256 153e28d4f8f7846fd0e09abc9b4ed0681b50cd8e2bb6100a1c3b91bf397b3934 SHA512 0f3b2df55277f9f44e39270cdc6a5695dd15e8095874406de5830c2d7d45dd364abcd5eafc9323e2a76eeb6622aa7da39734995be01e7f026d8f2395803c2ef3 WHIRLPOOL b91f89f7d6139ae0729509c1e78a07cf37d9f30d25223fdb6e19afe3ab8cbff3042e4b88f17e120a5faf69a05eef29f62b5f882d7b9e7760c29565944d02d150
+DIST c2hs-0.27.1.tar.gz 205108 SHA256 668af07f261c7c6c2537921ba58870cfb1114b33670f2c182e6f9a8794ffe41f SHA512 22894e518512a53ed23b2d6e3395918a1fdfb60180a9ec489bb7fcb70d5d870bdb37c66e9a49f07ae5babf3808e57f1d932e13cf80132ab50666c6899d55d62a WHIRLPOOL 485cc1d95cae475fbee48a72e202ea7bd50acab0ccb65415b58829dce005348df0c11a361917cddff382196dd1b646d814885c11eb958d9406814a32f41af4fd
diff --git a/dev-haskell/c2hs/c2hs-0.27.1.ebuild b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
new file mode 100644
index 000000000000..c5c76e859d02
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
+HOMEPAGE="https://github.com/haskell/c2hs"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="regression"
+
+RDEPEND="dev-haskell/dlist:=
+	>=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:=
+	>=dev-lang/ghc-7.4.1:=
+	regression? ( >=dev-haskell/shelly-1.0:=
+			dev-haskell/text:=
+			>=dev-haskell/yaml-0.8:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/transformers
+		!regression? ( >=dev-haskell/shelly-1.0
+				dev-haskell/text ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag regression regression)
+}
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index cdc7fcc692a7..5d46247d027e 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -3,3 +3,4 @@ DIST cabal-install-1.18.0.3.tar.gz 254044 SHA256 81b85757944b6ee0dd30396bf5851d1
 DIST cabal-install-1.18.1.0.tar.gz 257577 SHA256 d6abb6fef8204780a41aff2e93dfa297883673507cec557348aebf6b37843ae4 SHA512 252304480ebde673fba873b9d7f709e47d1acfc7ab936a2b19f663d8e3c8ef7a20abeaac0cf9bbdb4bf0d1c30688e8a9b1cf1f73c27ce8f47845c3431de6752e WHIRLPOOL 1d2bd46e88a3ac48fcd46cc229f2a90059b0d48ceec9bb04cb91c68adf7690bbe599adc518cce0e76bdffe80eff0cd615f7d25843a7f0f0090d59a34f5b37df2
 DIST cabal-install-1.20.0.3.tar.gz 274779 SHA256 d2bd56f3bcae92b7b97325be5216f94544fbcb30e10e24b40bccc149584b0b14 SHA512 a272c7eb1c87a933b30697afa7bf78f95fb0afa203e791448d5e96d5c62105533347b8b777af7a7e6db5703654c319045e089d46d2263a09ed5ada10144ce12f WHIRLPOOL da95f8a386c751c8c83ffa965422ab8fcf047693300f6d7ed39ec046354c8b00753fd3f0936b56eb5a6e854e5176ad2e20282e2bbcc0745f5ef4d462e59f4d0d
 DIST cabal-install-1.22.6.0.tar.gz 302564 SHA256 9d239e385696a7faa49f068aea451882baec6a7df26fbddbd08271c9053cb0b4 SHA512 155227a0bc29f8d6c9ec9846f1dbd956234853b1301fa15ab81aaee654abba8bfbd19cbb608008427b1272bff7aa397830011855b85d0a13deb9ebd1485cab14 WHIRLPOOL ca1bac034fcd502c45aab36218847a1a1b36dd47caf854e5b619e61ae3d67b65cbeeca5f4e46f856095f7131dbe2c1a908de4ee127f8c6a2c4e1806c40a05a1f
+DIST cabal-install-1.22.7.0.tar.gz 302579 SHA256 b30fd14f20fdd11b028cba68fefeed7eeadcacf919e7c29bc4d7289a656d19f3 SHA512 a88895ee38bf7451ba6a2e929ff224643ea0a536a9633d463d91a471e41b6aae302af2c3ca4fc914e4b3401fcadb137bb0c68c9fb7d0f768835374aef1b22766 WHIRLPOOL 2315f7b510456fdc4db7348d67fcf5c3ceb3ee03684297d6f429f4aff62a681c70aeeb34beac48d3481f7920d4b123369a21a4f340b899f7b52431119d3e680b
diff --git a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
new file mode 100644
index 000000000000..236d3cc3fe1f
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit bash-completion-r1 eutils haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+network-uri +noprefs"
+
+RESTRICT=test # missing files
+
+RDEPEND=">=dev-haskell/cabal-1.22.2:= <dev-haskell/cabal-1.23:=
+	>=dev-haskell/http-4000.2.5:= <dev-haskell/http-4000.3:=
+	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
+	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
+	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/extensible-exceptions
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.5
+		dev-haskell/regex-posix
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.3
+		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
+"
+
+src_prepare() {
+	if use noprefs; then
+		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
+	fi
+
+	# no chance to link to -threaded on ppc64, alpha and others
+	# who use UNREG, not only ARM
+	if ! ghc-supports-threaded-runtime; then
+		cabal_chdeps '-threaded' ' '
+	fi
+
+	cabal_chdeps \
+		'QuickCheck >= 2.1.0.1 && < 2.9' 'QuickCheck >= 2.1.0.1'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+
+	dobashcomp "${S}/bash-completion/cabal"
+}
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index be4e102e86d5..b43cc9981e4b 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -5,3 +5,4 @@ DIST Cabal-1.18.1.3.tar.gz 705715 SHA256 25c436290dd9d05b588b6b002f0357302a9b0bf
 DIST Cabal-1.18.1.5.tar.gz 706722 SHA256 2a5f14599e390e4ed6fc78ad05e16792a671bd5c5b479c6834aa1a000ff45237 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef WHIRLPOOL de3dc78ba6f99107746c75cedbdefd5661dea773cff5362ec73695b1de3ed247f0e034551da5fa39e46084ed81ee6fabbba1907f199a12c4599d66db2f7fb974
 DIST Cabal-1.20.0.2.tar.gz 717941 SHA256 234d2299bcf580f727cd3fa649448ff84b304d1f270e3b6836f8e2211d11bf02 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3 WHIRLPOOL 38ccfaded54fb86bedca33dd48742f06763b6b7dc89444dac6846102dec27fe61acefef3b1f0a3e4053751e88f79ab523e89264f070eddc999ca9810b47cce9b
 DIST Cabal-1.22.4.0.tar.gz 404549 SHA256 b96a8db268e3501ded01bdb0d178fe334274e92c1497c3249a59ef5cfc55dca6 SHA512 0a25889fd5fe224868210091f429489c24e01334b2ae49444dfdfaaae6e0892a8c3262e4146fefc7f95b165d637b812abd9519394de9a7d801fda9a75a945b31 WHIRLPOOL 996fd9ac055afec29f16c1e91e38ee00193894c3ed7e183a017a2fb04ead50dabf247e2209c17c5ca66c0016fa676cead36b8b0ee884f0353d3b85e08c3a0541
+DIST Cabal-1.22.6.0.tar.gz 405017 SHA256 e6a58714bd33ea107b5e99c7f149b48ddd3fbfa72e6105abbab4478bcf4f2433 SHA512 f7a4bfed3a2c10709b4e1fa6abfc612835d1874e976fa732dd0dd8af41c92dcb1ba55482fbbbffd834579cdea4625d00aa11f83fbbf5b6edfeff062b332a27bc WHIRLPOOL dc1c64e771473b42954ecd78dc58434fd3822a3612ab4279697f7abd7b5c3a8be5581473a0af6188fcdd6cf376afae6befe7894c54ed27688c4a9b190e9ea0b8
diff --git a/dev-haskell/cabal/cabal-1.22.6.0.ebuild b/dev-haskell/cabal/cabal-1.22.6.0.ebuild
new file mode 100644
index 000000000000..2018c4615bb5
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.22.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile test-suite"
+CABAL_FEATURES+=" bootstrap" # does not need cabal to build itself
+inherit haskell-cabal
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RESTRICT=test
+
+RDEPEND=">=dev-lang/ghc-7.8.1:="
+DEPEND="${RDEPEND}
+	test? ( dev-haskell/extensible-exceptions
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2
+		dev-haskell/regex-posix
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	if [[ -n ${LIVE_EBUILD} ]]; then
+		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
+	fi
+}
+
+src_configure() {
+	cabal-is-dummy-lib && return
+
+	einfo "Bootstrapping Cabal..."
+	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
+		-o setup || die "compiling Setup.hs failed"
+	cabal-configure
+}
+
+src_compile() {
+	cabal-is-dummy-lib && return
+
+	cabal-build
+}
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 5945ea3eaaf4..52b462a86db6 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -6,3 +6,4 @@ DIST cairo-0.12.5.0.tar.gz 53247 SHA256 8bbf953775c371d6a2dc0072c68c6804b886fa52
 DIST cairo-0.12.5.3.tar.gz 53447 SHA256 e7edb538745a6f0aa1c0c1574b6549a799240912f9c5047c3d8ca1ffdbb1bcbc SHA512 1dca628c4052df667130590d963f3b26e1c7df958654dbc18cb76cc471ee60b19fa3fc65a3b9042990943cc95a4af05d8993d853e859f03e457a8a6963113433 WHIRLPOOL 94b422d97cf013e5b6845494feef53e3489d1dc063e5e89571ef2a1d94e14cf8d929afd5ff8c266a334a25b7ad42f52106d9b30c2981bb7c1510d103d8e9731c
 DIST cairo-0.13.0.5.tar.gz 54035 SHA256 191cd974a99b7abb901219edddbf59982e235e69552f8f4f97aa7b96dd87662a SHA512 d5951abdd3f0163a9dc6e6e1b7d30f41e4d8b1557123e4e40c20c74469ff0b7cb2de8b373be101221d5b6401dba39b09c0ab6c45549d2c9e04692215a85c87fd WHIRLPOOL 5476f3b6391e20b770eb005da4e846026bf622cf0c722a14372a017112e392c4a41c4a2044cce15aadc9a7450f25fdc34489cee6b0dcef8b8848f217ca63c07c
 DIST cairo-0.13.1.0.tar.gz 54143 SHA256 6b8e3fca37104022c53442c62bcb41c18d3e2fed4df372c1de56c41f3f7d276e SHA512 95a222869e11856c2837df3fb8f50e84a37c669ca2630ba9002a07eaf4a69e0bb21da5b4b66a7d564f53dab21a54d419a4f6cf5fbb3f512649c4729107ed70fc WHIRLPOOL 7d2e76af39aefea8c6daf3f40214a54ae9f8ea9964e2bf012b8e6a8a687da26c6945e26cda19cf891caaec1f24082ba97b79bf9a3e5be7683b073fb5ef39c007
+DIST cairo-0.13.1.1.tar.gz 54029 SHA256 58ae22451e7812a88531eaf91ae1250c277f48d0a88d1cae2438bd76f79e89f6 SHA512 bf621799f2615e93f0151282772fc01f370060e3454810aa3e205eab16804637acbaded0c1feb6f45adbf75384ccade9b11b5ea70cb79397e7815c59ca570e29 WHIRLPOOL 8a838c64bfbc48d52f7c7a7e294322fc3f9e829d99bc5ecdbf80abcc6b78e366a7b96f5a5dfeb3990ea4de4245613cc72756993f8c7ff8272b00e584a86dd38b
diff --git a/dev-haskell/cairo/cairo-0.13.1.1.ebuild b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
new file mode 100644
index 000000000000..bfd1e931a04d
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+pdf +postscript +svg"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	dev-haskell/gtk2hs-buildtools
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag pdf cairo_pdf) \
+		$(cabal_flag postscript cairo_ps) \
+		$(cabal_flag svg cairo_svg)
+}
diff --git a/dev-haskell/case-insensitive/Manifest b/dev-haskell/case-insensitive/Manifest
index 62da525defb6..6a2e4fe42ca1 100644
--- a/dev-haskell/case-insensitive/Manifest
+++ b/dev-haskell/case-insensitive/Manifest
@@ -1,3 +1,4 @@
 DIST case-insensitive-1.0.0.2.tar.gz 4803 SHA256 c2952ea7e2fe052c5f8fc07d2cded328c50cb3282006d9a276d7f8101eff8c85 SHA512 101ab558b4359da40320293c5ffafaf2f69bf9289ea0fde1ea9775847ef7e31959b71c2c86c7d150d1ed6e0c71209c10d7c83bd416e170f233fad31f81ff7e7f WHIRLPOOL a0b3ee9a02b66290f4d5b94b11c90927d9dc22692ae1ffc1b78d69acb40e6997a25910a3673c550d9057db7d4b6f5d9169c9c40eea7411c1aa639f289420e7f1
 DIST case-insensitive-1.1.0.3.tar.gz 5188 SHA256 7b255fe63155d53ab84b248ab5ba9306fd4bec47a6198e3275cf9cb41c4d263b SHA512 d9b21c31e65224e5ce181fa680ee7f67371ae03248a51a2329e46ba27b22e0f426e02cbc872af7ca42c84d56450ffac2ff62ffaf41e7055abcb43aa97e3c404c WHIRLPOOL 8e08473869e237b557ca4962401d8e48b3c7eb8ab337413d78b441915a04295907136daca45bcf6fc2a7173382b883628b93bbcdc138637ec5f2d327ea43e986
 DIST case-insensitive-1.2.0.4.tar.gz 53377 SHA256 63830d4b6b8cd51f4e40e492c17b5eaa11ebab5ef28eeb344e57709f3220d51e SHA512 15aed92814756f3cd1b58d38e52623cc9b6121874d7779a5e2490322713f3d5cb1cc7bcb4864b3ce2e387df87291e52d3fe8bfb9c836103007fd561a2c1a65e2 WHIRLPOOL cd8517934ed7d02955475a3a95e0d77a30cc8aaa99da8b4826064eae5aba7fd487563b9411d2ace4e8dfe6eb48c97d5af692c3cc76535be8b746c09e03bbd8f6
+DIST case-insensitive-1.2.0.5.tar.gz 53404 SHA256 c450d04e018a027747592482d7b4d8725e334bde38e903d4f2c03f99583d3700 SHA512 8b43fb205cac13f36c4f22ece3672478cac940a23552fc61534beedf12dfaf22107c982513560be154882efd1e4b615f581bd318b3df177a3b1c7477ce4501a5 WHIRLPOOL f127053839cf3d74e1533e7131667d21255159abe433d7e007402a72d8680529a04299585d7c60d64e338016b96a676fa39b56c84b6b1b04dec66516ea371426
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
new file mode 100644
index 000000000000..16e785ff9306
--- /dev/null
+++ b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Case insensitive string comparison"
+HOMEPAGE="https://github.com/basvandijk/case-insensitive"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
+"
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index 25583987eb00..8622bd1335f3 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1,2 +1,3 @@
 DIST cassava-0.4.2.3.tar.gz 27977 SHA256 4eb0cfc9ddd351e643d4787d3b778614b331431d5ab7e2f9c91376ea478dd08d SHA512 09dee994afb3724d1454d2d2ef7f44d1d81edc4fdc521b9c3e88a47cfc3d83355dc7a1daf437c500b9289713190e5080e575d458815aaeb74848e5ed5588a93a WHIRLPOOL 63f5fa2e53a92b3de6a17405ec8f8c5436b0db636a628846206849617d8c81e843a3cbf3b6ba21dbb7fcf884269efe018849bbc569230afe004593ff91820284
 DIST cassava-0.4.3.1.tar.gz 31922 SHA256 e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac SHA512 c994754e3dff232f1e82789f02a401dc4aec6a51be5d63e48da9552ec555dced5acb8bf79433975731bf9e8291e10286fdb7ec4282a210ed3e65e9c0066bf217 WHIRLPOOL ea86bbff358a46f08687c314a9cf9fdd0c009108d07e5d635c95837eadb0211882be62f1b3e2c46b95fb8216c9ee6619ec8e78feda12b786249aa5c5c1cb0f53
+DIST cassava-0.4.4.0.tar.gz 32631 SHA256 0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f SHA512 af0954754bbcfe8068ccd029417327770c60a62ecc5503b3cce5a58962940a804e167688760aec7ead42ec99b404295715d2f8fd65e4b4ed2918e1c5e063b36b WHIRLPOOL 83a7bec7afd9c6550e20871c7aabd353cbc9241aa49a1bd90f96047041a1c665179e60926e11ea80e9df6cd339334daeb046857c24d24f2cecfb76c1c923b32e
diff --git a/dev-haskell/cassava/cassava-0.4.4.0.ebuild b/dev-haskell/cassava/cassava-0.4.4.0.ebuild
new file mode 100644
index 000000000000..ec0f6c6f8de8
--- /dev/null
+++ b/dev-haskell/cassava/cassava-0.4.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A CSV parsing and encoding library"
+HOMEPAGE="https://github.com/tibbe/cassava"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	<dev-haskell/blaze-builder-0.5:=[profile?]
+	<dev-haskell/hashable-1.3:=[profile?]
+	<dev-haskell/text-1.3:=[profile?]
+	<dev-haskell/unordered-containers-0.3:=[profile?]
+	<dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.0
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/concurrent-extra/Manifest b/dev-haskell/concurrent-extra/Manifest
index 684026914f30..beb0d44eb9ce 100644
--- a/dev-haskell/concurrent-extra/Manifest
+++ b/dev-haskell/concurrent-extra/Manifest
@@ -1,3 +1,4 @@
+DIST concurrent-extra-0.7.0.10.tar.gz 16205 SHA256 6f27cc0a90f5f25b3c0a1e9e3c0e3b407538908c061c5b7da34461b76e1adc12 SHA512 2414fdb493834480f31e13b515233ea7739d46a170da12683b944de8372289cdafebfe8cf242c2edcceafc1fe3e659b0b20a0dcb4826d925cc50f6c1ebe73a58 WHIRLPOOL 1a098e894e2049f137fc32f36fefd7ad03b29f0d1f9a17b15d43a3806faa4c558a0cbb25c2c20ef91719bdbac769b7ef446e63a5efca53a3912fd4387beeea77
 DIST concurrent-extra-0.7.0.6.tar.gz 16447 SHA256 11a1b241b6be6502af86b30a060218fb6776d636dc11399bc742f837a141988b SHA512 77e01122b4659cb131af596da6b4638d34365f3be901b46adb1e7ffcb9d218727feead51b107df0418e1f929eced5aea0ce412ff59ffae3bb6b5d50215b277cf WHIRLPOOL d3f28b42dc115b5607b02b9235b8ec4221e59734a9cb6981fbd1fd662c72d70776df9e2cf4a533c373eeaa11b446c8c3e0111ede89ba6f241f9b056f13088016
 DIST concurrent-extra-0.7.0.8.tar.gz 16646 SHA256 78203bfb522583ebdc2ea6c8708049b83710935dbdfe916576dbeea9283fd660 SHA512 f34a7dddfdd282c72449ff53394977a118bb24b58c84d6e784f117037bce0d36c8fffd790abcece0976e0d29a8613fa85163ce2b740909aadf7afe04ce8fe734 WHIRLPOOL fe6689127705b77db2ad86ff4b85924890c3192743f74a5ac59ad6f0f5d71360fd45eb9d18b0c955af3994e7826b72922ac4fc4d37ac5b883b60f09917f15f76
 DIST concurrent-extra-0.7.0.9.tar.gz 16209 SHA256 5c8535c5155c747fdc04fcf731da3ccad6236e49295e6fcbad102e9b17a878a5 SHA512 2ccdb2ceaffed411b6e8b1723ff4c0d489425a83b9237b7397553e78bea6702cf2bf8b7d96d24c285337a8768b0859a7c45442cb55f3a3f59d4ecba228bead72 WHIRLPOOL f83640847825f779dafbe2459a6291e849f440d90b62437f43ccb105faf6af877b0b5ae7e02dd9007697c2d48a638b28c008ac08ff10f3047cbe76e53aae872b
diff --git a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
new file mode 100644
index 000000000000..aebc167202b6
--- /dev/null
+++ b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra concurrency primitives"
+HOMEPAGE="https://github.com/basvandijk/concurrent-extra"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
+	>=dev-haskell/unbounded-delays-0.1:=[profile?] <dev-haskell/unbounded-delays-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/async-2.0 <dev-haskell/async-2.1
+		>=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
+		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
+"
diff --git a/dev-haskell/conduit-extra/Manifest b/dev-haskell/conduit-extra/Manifest
index fca530f28ef1..6e4c786e4e82 100644
--- a/dev-haskell/conduit-extra/Manifest
+++ b/dev-haskell/conduit-extra/Manifest
@@ -1,2 +1,3 @@
 DIST conduit-extra-1.1.7.1.tar.gz 28862 SHA256 a34bbabb1f167042540a8d56010239e5ffb3f6136d471584168912e23193f8e2 SHA512 bf1e860132b09d05c6279ee5ee3528159eb6dc01f1d141a453708ba00c541728e9cc3d7c7d9200a9a52d9e3ba2c18940c98665e7a54c5747df991afa3b04951d WHIRLPOOL 832ee2d42f77ac08a9210a2fd3879b1ddba077895718f320a02b69ea60250dcc3c30c2f6765b500cab78cbbca1da711b9596588e4a7e229d5ac698ef2f0dff08
 DIST conduit-extra-1.1.9.1.tar.gz 29571 SHA256 3f1be15bef32652caa9a98e175c95614c0f6d04ca29c35d30ddbc940a90fa0a3 SHA512 3e35c303fb9696f99af99db6ada5e59dcde09e0ce3d3559aed2b3354dab1a96d523b7976643239892316a709289e4943aea37152a2935c6c256b24e5b73dc716 WHIRLPOOL c1e4e6325a32ab0b8fa9fe788ac6b0437bf352793bc71403d9f9e3946b807acdd01dfcd6426238579c4e6f48aaa2ebdbf3db2a6c9f93c4f107f75367ae38a933
+DIST conduit-extra-1.1.9.2.tar.gz 29576 SHA256 9a7b3f44990014082f589dd91f70d8b5faef66e720677888a54fb2e463940a9f SHA512 ddc8e99c3b939704421d464c928d8fc2a591cdb4e44942cebb670d5c3e9a4d96fa03c227a1acfd227560d45d3eead7ff6cadde54ec8e78324eb86a861fbb8576 WHIRLPOOL 909915e00e17f513b5df970fd2a553dd05f73610c0719677fde6863af871a9093d1057e230bf627aa1a9904fe4d5c6228f44e202782020cfaab2fc28a458f591
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild
new file mode 100644
index 000000000000..0153ecd48afd
--- /dev/null
+++ b/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Batteries included conduit: adapters for common libraries"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?]
+	>=dev-haskell/primitive-0.5:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.11:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/async
+		dev-haskell/bytestring-builder
+		dev-haskell/exceptions
+		>=dev-haskell/hspec-1.3 )
+"
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index f76599e867d2..6b12431a28ee 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -4,3 +4,4 @@ DIST conduit-1.0.9.3.tar.gz 33958 SHA256 90ccae260f2871005746995d4ad8dd215fdb73d
 DIST conduit-1.1.6.tar.gz 30968 SHA256 03e7fbfa869de3d7aa739ddfc758cf57d16d774774d6d59c698e8cf47f9112da SHA512 fb0ca3f9afd61cbd62b2d6bf73117d8521cdc838c1a71567c4c35aaf5ee60d4a9525a6eac1bc8fc4f7762387d67cd5ea999f30f231a8ca9d6622b63d75692ea9 WHIRLPOOL 0d93ab514eee998c915f2acda81a7242ab21b24e58cbd14a3ddf0e78c6766ee35251b8dcbde62b98973bae5af1278c5e6908626fddc68a6d02cd442706116ea6
 DIST conduit-1.2.4.tar.gz 47223 SHA256 70e363f7b3c682fc5700274ba2a3919247f2e54048dec224c3765a5e8b940aef SHA512 28f1dcf17daa0d93a2c68af2070e0b2d9845b3488fb7c6caaad5d141891e8937b49a31393f327ffd333bf1a268eb46503bc4e5532d3ee9bf6431b7166c7cc6b4 WHIRLPOOL d710bba507583537acd5154482c0b96037a23518f48685719b98cd15f1e3babc1265338e67c2cb08dee831c778dd06ee895f7783e417ecc9d5948a29bacca947
 DIST conduit-1.2.5.tar.gz 46805 SHA256 b100cdb428731923205372dded60b6529d33728f69a0eb951a01f53c182c2a46 SHA512 baed9cc78a59ee764134e2aa478e4871bb2bbf0f905f3c8a0d3ea5cd7259a9b96e4003664f5daf335ac77525f92c502f729d1ffb5296ec172648b10d5172eb9e WHIRLPOOL 10ed28e9efd5ebe3623e67b7dead83fae43773878077815ee7814b2f24ff2f9d82e15ea2d681334f7be321f0da4360d876081dd9098dad28686a93270689d03d
+DIST conduit-1.2.6.1.tar.gz 48531 SHA256 ae38875a01312070cc1f59aba6687b7b8619416f426299ab126e08023c22309c SHA512 fbeb437897a0ae00a5d3f5b12565c0a4f5e3807d8d9fcd6aaeeafa134ed5d0493a2a403dbe86112be9af49f8b7af90c504aafce0505f0a854a05a66a5175a6d2 WHIRLPOOL 3df090aea26e199879c0657bd54f986fd1b71a7098551e393ac804e1fd8ca226a95fc96d0af05730f1098dcf819ebc8b286839f937d0ced8e692398755605e38
diff --git a/dev-haskell/conduit/conduit-1.2.6.1.ebuild b/dev-haskell/conduit/conduit-1.2.6.1.ebuild
new file mode 100644
index 000000000000..91ea7ad6b14b
--- /dev/null
+++ b/dev-haskell/conduit/conduit-1.2.6.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Streaming data processing library"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	dev-haskell/mmorph:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/void-0.5.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/quickcheck-2.7
+		dev-haskell/safe )
+"
diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest
index 59dfd816cd3b..88e3312d082b 100644
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@@ -5,4 +5,5 @@ DIST contravariant-1.2.tar.gz 6574 SHA256 0ed101054717ccc031337626317eb262f9f8e7
 DIST contravariant-1.3.1.1.tar.gz 9380 SHA256 dab5bac57c985ea03429614389d363854c82222a269d5bc8e164dc3f1a8d4e4e SHA512 10fde1b064a4f1c82f3e29d761b2aebf5b3265c81ae2430ea37ccff66360fef3b623a17dca511f485542225d960b4435a670ea9992039194ff40d3202d2237f6 WHIRLPOOL 794ce382bf16ce6c43ede5973127800bd15809ece47e09bf45ff858952595db607d8cd7b2ea138e52c020cd3da1bcd14d08e8e87ba856583311e841ce26c9e0c
 DIST contravariant-1.3.1.tar.gz 9377 SHA256 bcb351c0e6e6c95623f79d38f9ccf24cbad470fd52aab696d3e045d28495f5a3 SHA512 277aaa217bcd63fe17045d8445e5981923d44665467222d4ca6e1e6bfaa891ab554526f727a76b96032fcca0ec6175005dac8b76537c6af2a121013fe967d805 WHIRLPOOL 1961ff6ed036d34f0b1ea67730ee22eb447f4e217455370a70093e0babf4e32250012fc72b4f0086d5a46082caf0c3410891947b86740e16c95172b0ccff6e8e
 DIST contravariant-1.3.2.tar.gz 9442 SHA256 52baae0676d6d5bcf7d891e6cda4580e58646c747d570bdde69b0023c2576639 SHA512 99fc77ea267ce1f2f6c3b86a759042b9ed5d9c55b31aa626ac868b06d66fd0dd4bc356bd7bb449581ee42ebd101a53a7949a3ecfd833729a2736c799e91e0fc8 WHIRLPOOL c80ee029b0ac7f2e901ccba0a40eeb59bcbff99fc80b355bee993e986a3285db72c00d5652768a7dbaa032db4394eba67d93c6cce913c9dcc36afbd2bdac58ee
+DIST contravariant-1.3.3.tar.gz 9923 SHA256 65390e2bde01c1cc91cfe414b5ad0aa9dcb26e527f0646719d19dbaf616590a0 SHA512 38b9db8035a42c9d8bb1572f63b7fce0f94a93d78cde43f1ce9da5284323b51d71e5432d3aecd128946d7b918b264a1e103e04976ebc9feb01c782e1ea2c683f WHIRLPOOL f69ebf335d4b2949e7f99345e217e6bc1467cb2bd1512edd528d6bb85febac96e347e28978d0283c09172af3fb552d8d370fd2ffb640496180ca818cde873724
 DIST contravariant-1.3.tar.gz 8425 SHA256 b97461950015b696956dd972a12c899f9c469a63e482c88307e3d8f338d1e891 SHA512 7cd78603ac69b5535b2b0ca1c121bc015dc87e4c5dbe78bb1194d93493ab623cfe6d29b9b9063d6ec73df12af4a339de06131976ea964db85075c48458068415 WHIRLPOOL ebb876f042bc86ac917411f1de6859ffebdf25e9302c7ebb5da1d20d268c0d53f837813a8ebef9b348c7f6414bc9c0b180465c67931562bbbe633d852c1d3748
diff --git a/dev-haskell/contravariant/contravariant-1.3.3.ebuild b/dev-haskell/contravariant/contravariant-1.3.3.ebuild
new file mode 100644
index 000000000000..b492ac02be03
--- /dev/null
+++ b/dev-haskell/contravariant/contravariant-1.3.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="https://github.com/ekmett/contravariant/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+semigroups +statevar +tagged"
+
+RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
+	statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] )
+	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag statevar statevar) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index 549aa94f3142..acccf059d085 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -5,4 +5,5 @@ DIST cpphs-1.18.1.tar.gz 72693 SHA256 15ee94a58c34f8c720732c4980c0391481060613f9
 DIST cpphs-1.18.5.tar.gz 72221 SHA256 e71d9ea2c4999905f9910bbb1b947dcef1950dacb03e17c2d9bb5b3739f80e2f SHA512 606aed6241b1e7a1f62a97bc103e1d11106ae6831c80bb7ea7ba469b7aab61ade714a5f38a22f2b3f3b603d43508c2eb31909164db59a5ef4aa64b351cd2ff21 WHIRLPOOL 34efa940978faffeaab3dd4865b1a49671f5ea221200a6cf8c4874fe0da41caa8fc2dc0ac558cceec1f596c2b315d8234b1de1c314962d7b3857cd259ba2e530
 DIST cpphs-1.18.6.tar.gz 72737 SHA256 ac3f120aaa4d9982f8a2e63826a40b3413ed853bf04bca86e3fac5a5be084737 SHA512 345a827f1742ceb5117258f7ee8bd7b5638d46126504247f0b0ca38777711432a9f40899b30f1e98e4b514aa8a6ad512c010dae7ae7f72ba3ed8da31632b8c2e WHIRLPOOL aa9e1e16ea65499aab64ec19d9cd34ce5fe72ceeb77dea5277cf9a91286cb823e993756fdf1e233db4de5a13a50cb32231543d7cdacd7094b49ddb83d6bfe1a4
 DIST cpphs-1.18.8.tar.gz 43861 SHA256 a3a4780f91082e23d3d7b9d0f20dde13d42641891b4c488b63fa97e0e01ebb20 SHA512 ed6041e6e5c358656685d5a62f5e2cf78a8d714feb6844cfcbd6c852543e02410f78e3ed60f23ef52aaccd999a83b27d3d83950724c07c1441e0648ae31a622a WHIRLPOOL 72c03c61bbcf89deeb323e4c4c8973ba928c913611144cec811311219e2978d5d968d2b0ad13c29372c6900820b61b3a04d083ec1a89a744b807ffde1ec935b0
+DIST cpphs-1.19.3.tar.gz 44306 SHA256 e2546aa382e9c22942c5c2849631edc6b1d8cbea2c50762f66b740755faf57da SHA512 30e647b55a7cd86a21ba2346adc2f932c2557e52e59437f523e3300b285c0de51fca43aa29ce9306bc5e3919ed02a51e72056531c33dc52efc1a320ea84746b7 WHIRLPOOL d322b5c94d9042e2d02ac279e0f33cfde6cb1df378922aa78a3ba687c0684f3ce8b950fa0551dfb0c7a204292d418e0a1c78036e4d375794107cb657384bdeeb
 DIST cpphs-1.19.tar.gz 44056 SHA256 e05c97be645eafeed5c7475f84a02016ad56eaf67ad0a725b8ebff7fbcc73e3a SHA512 0d992e4ab34cb9e6a83362e15aac767fe8b8ead8151620cca588c36c165a751e7079444a4bf0dd14068ed3941c7ad1d9db32c408fb8ce97961d9bad7894a3523 WHIRLPOOL 71e19b57a3b98b4b291698833d813243bd2f9c843651fad30ac1ec15def9f69bec51e8f0a6335d4e513d4f0f20070607c88be940e331a3eadf93e2aa8a3c11fa
diff --git a/dev-haskell/cpphs/cpphs-1.19.3.ebuild b/dev-haskell/cpphs/cpphs-1.19.3.ebuild
new file mode 100644
index 000000000000..c7acc99e9d11
--- /dev/null
+++ b/dev-haskell/cpphs/cpphs-1.19.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
+HOMEPAGE="http://projects.haskell.org/cpphs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/polyparse-1.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	# https://ghc.haskell.org/trac/ghc/ticket/10667
+	[[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
+	[[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
+}
diff --git a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild b/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild
new file mode 100644
index 000000000000..35a550b74a44
--- /dev/null
+++ b/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -old-crypto-api
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conduit interface for cryptographic operations (from crypto-api)"
+HOMEPAGE="https://github.com/prowdsponsor/crypto-conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+conduit11"
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/crypto-api-0.13
+		>=dev-haskell/cryptocipher-0.4
+		>=dev-haskell/cryptohash-cryptoapi-0.1
+		>=dev-haskell/hspec-1.3
+		>=dev-haskell/skein-0.1 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'cereal       >= 0.3 && < 0.5' 'cereal       >= 0.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag conduit11 conduit11) \
+		--flag=-old-crypto-api
+}
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
index e78409bfbab5..c5f1b425239d 100644
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	cabal_chdeps \
 		'base >= 3.0.0 && < 4.8' 'base >= 3.0.0' \
-		'QuickCheck ==2.5.*' 'QuickCheck >=2.5'
+		'QuickCheck ==2.5.*' 'QuickCheck >=2.5' \
+		'executable tests' 'executable dataenc-tests'
 }
 
 src_configure() {
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index 0454ed108324..edb8a63eb84d 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1,3 +1,4 @@
 DIST dbus-0.10.10.tar.gz 73707 SHA256 cd68c5613fbad01a31be17501e2b4cf242b09625d5fed9474db6c4b5c4f22468 SHA512 c2faa76c32abb19ab903c015f6fc133beb605bbb4459d018fa544ffe4e04110cc63fc45815d862e8311f5b99de9c180c8eeb8e135fd6c7eb388ff579529a8ead WHIRLPOOL 919905324f7910a9b0a4ef77ca418a6610f974b79941141822eab8eb7c2505b918868f0a74c33d5d928612992ba6d03ad6889cd9fd3e726b57181247a252abef
+DIST dbus-0.10.11.tar.gz 74853 SHA256 73e6b2b2021215dd8b9540d770e5cc353427f37083c7d84ebc244ac48e630482 SHA512 290c1e9b142b920d56c59f3b250da88e114d850c8d846c37b400b21e92fae2d58983b4821497b61d0ff96f54179aedb70a5eb3ca40e1fbb6bbe59dee2f9256ff WHIRLPOOL d126478c8d041362b7cee452c17960e620670618905b64bd6697a0895762c8c9bfc03722829a77d20d4a3bdd98525fb994b1264f2b203ac5e8a7d509c3985cd3
 DIST dbus-0.10.5.tar.gz 73715 SHA256 3d103e5f119ca15ebb64ca43e10d7a96ab6b010715132b3eec6b6c4ef9c474f1 SHA512 be0c78cf042e536c7a9e8630259f209a8d7bd1f1e0e8b653ab53dea63460e92a4158efcb9808c336bb82a7b6e473bc5148245890f47b2f826a7b6a0c1ca06d92 WHIRLPOOL bbc67894b56146a0454a4c87f47b99b719b2fda71e6f3a8fe8ec1d72ce364931dc7b3196bc8e5bc882b743cbeb9873026382092d4699a244302c2f2b9baeaa73
 DIST dbus-0.10.9.2.tar.gz 73294 SHA256 d4c888d03e32d590528e8b7452cba9dc3fc3c675318215840dbb66f4a48ae177 SHA512 b72f1f3676dcefbc22677899cbd148f068ac49951ec8821f7b0c1e0e026964fc1a6060c8ab83943ef9ff92529fd6726d653b788f1a0eaf0edf71ac0d61cec7fa WHIRLPOOL 6d9872e88c4921d89b316f7275bf5e37619096b70772ade000a8b237473da6e315b7ae23c4836dabbfd169c3d30b7dda00a497aae0172f299590c10c0305852c
diff --git a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild b/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
new file mode 100644
index 000000000000..8a9f3bab2b29
--- /dev/null
+++ b/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A client library for the D-Bus IPC system"
+HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?]
+	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
+	>=dev-haskell/network-2.2.3:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
+	>=dev-haskell/text-0.11.1.5:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
+		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
+		>=dev-haskell/quickcheck-2.4 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cereal-0.5.patch
+
+	cabal_chdeps \
+		'cereal >= 0.3.4 && < 0.5' 'cereal >= 0.3.4'
+}
diff --git a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch b/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
new file mode 100644
index 000000000000..5c2c4c57cbb0
--- /dev/null
+++ b/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
@@ -0,0 +1,113 @@
+diff --git a/lib/DBus/Transport.hs b/lib/DBus/Transport.hs
+index 8c50ab9..9517212 100644
+--- a/lib/DBus/Transport.hs
++++ b/lib/DBus/Transport.hs
+@@ -42,3 +42,5 @@ import qualified Data.ByteString
+ import           Data.ByteString (ByteString)
++import qualified Data.ByteString.Lazy as BL
+ import qualified Data.Map as Map
++import qualified Data.Monoid as M
+ import           Data.Typeable (Typeable)
+@@ -49,3 +51,3 @@ import qualified System.Info
+ 
+-import qualified Data.Serialize.Builder as Builder
++import qualified Data.ByteString.Builder as Builder
+ 
+@@ -151,3 +153,3 @@ instance Transport SocketTransport where
+ recvLoop :: Socket -> Int -> IO ByteString
+-recvLoop s = loop Builder.empty where
++recvLoop s = loop M.mempty where
+ 	chunkSize = 4096
+@@ -156,3 +158,3 @@ recvLoop s = loop Builder.empty where
+ 			chunk <- recv s chunkSize
+-			let builder = Builder.append acc (Builder.fromByteString chunk)
++			let builder = M.mappend acc (Builder.byteString chunk)
+ 			loop builder (n - Data.ByteString.length chunk)
+@@ -163,8 +165,8 @@ recvLoop s = loop Builder.empty where
+ 				-- Return what we've got so far.
+-				0 -> return (Builder.toByteString acc)
++				0 -> return (BL.toStrict $ Builder.toLazyByteString acc)
+ 				
+ 				len -> do
+-					let builder = Builder.append acc (Builder.fromByteString chunk)
++					let builder = M.mappend acc (Builder.byteString chunk)
+ 					if len == n
+-						then return (Builder.toByteString builder)
++						then return (BL.toStrict $ Builder.toLazyByteString builder)
+ 						else loop builder (n - Data.ByteString.length chunk)
+diff --git a/lib/DBus/Wire.hs b/lib/DBus/Wire.hs
+index 43ae315..09bf8bd 100644
+--- a/lib/DBus/Wire.hs
++++ b/lib/DBus/Wire.hs
+@@ -34,2 +34,3 @@ import qualified Data.ByteString.Char8
+ import           Data.Int (Int16, Int32, Int64)
++import qualified Data.ByteString.Lazy as BL
+ import qualified Data.Map
+@@ -37,2 +38,3 @@ import           Data.Map (Map)
+ import           Data.Maybe (fromJust, listToMaybe, fromMaybe)
++import qualified Data.Monoid as M
+ import           Data.Text (Text)
+@@ -45,3 +47,3 @@ import           System.Posix.Types (Fd(..))
+ 
+-import qualified Data.Serialize.Builder as Builder
++import qualified Data.ByteString.Builder as Builder
+ import qualified Data.Serialize.Get as Get
+@@ -180,3 +182,3 @@ appendB :: Word64 -> Builder.Builder -> Marshal ()
+ appendB size bytes = Wire (\_ (MarshalState builder count) -> let
+-	builder' = Builder.append builder bytes
++	builder' = M.mappend builder bytes
+ 	count' = count + size
+@@ -187,3 +189,3 @@ appendS bytes = appendB
+ 	(fromIntegral (Data.ByteString.length bytes))
+-	(Builder.fromByteString bytes)
++	(Builder.byteString bytes)
+ 
+@@ -275,3 +277,3 @@ unmarshalGet count be le = do
+ marshalWord8 :: Word8 -> Marshal ()
+-marshalWord8 x = appendB 1 (Builder.singleton x)
++marshalWord8 x = appendB 1 (Builder.word8 x)
+ 
+@@ -282,4 +284,4 @@ marshalWord16 :: Word16 -> Marshal ()
+ marshalWord16 = marshalBuilder 2
+-	Builder.putWord16be
+-	Builder.putWord16le
++	Builder.word16BE
++	Builder.word16LE
+ 
+@@ -287,4 +289,4 @@ marshalWord32 :: Word32 -> Marshal ()
+ marshalWord32 = marshalBuilder 4
+-	Builder.putWord32be
+-	Builder.putWord32le
++	Builder.word32BE
++	Builder.word32LE
+ 
+@@ -292,4 +294,4 @@ marshalWord64 :: Word64 -> Marshal ()
+ marshalWord64 = marshalBuilder 8
+-	Builder.putWord64be
+-	Builder.putWord64le
++	Builder.word64BE
++	Builder.word64LE
+ 
+@@ -441,6 +443,6 @@ getArrayBytes itemType vs = do
+ 	
+-	putState (MarshalState Builder.empty afterPadding)
++	putState (MarshalState M.mempty afterPadding)
+ 	(MarshalState itemBuilder _) <- Data.Vector.mapM_ marshal vs >> getState
+ 	
+-	let itemBytes = Builder.toByteString itemBuilder
++	let itemBytes = BL.toStrict $ Builder.toLazyByteString itemBuilder
+ 	    paddingSize = fromIntegral (afterPadding - afterLength)
+@@ -568,3 +570,3 @@ marshalMessage e serial msg = runMarshal where
+ 		marshal (toValue (encodeEndianness e))
+-		let bodyBytes = Builder.toByteString bodyBytesB
++		let bodyBytes = BL.toStrict $ Builder.toLazyByteString bodyBytesB
+ 		marshalHeader msg serial sig (fromIntegral (Data.ByteString.length bodyBytes))
+@@ -573,6 +575,6 @@ marshalMessage e serial msg = runMarshal where
+ 		checkMaximumSize
+-	emptyState = MarshalState Builder.empty 0
++	emptyState = MarshalState M.mempty 0
+ 	runMarshal = case unWire marshaler e emptyState of
+ 		WireRL err -> Left (MarshalError err)
+-		WireRR _ (MarshalState builder _) -> Right (Builder.toByteString builder)
++		WireRR _ (MarshalState builder _) -> Right (BL.toStrict $ Builder.toLazyByteString builder)
+ 
diff --git a/dev-haskell/dlist/Manifest b/dev-haskell/dlist/Manifest
index faa2fd17e89c..f393064961a3 100644
--- a/dev-haskell/dlist/Manifest
+++ b/dev-haskell/dlist/Manifest
@@ -1,4 +1,5 @@
 DIST dlist-0.5.tar.gz 5962 SHA256 4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea SHA512 79de39c7e13b8423290c7afd5fd0218dbd8b12e6d37722084bca68074dd0940cf5aa6c3e757eecad5aff769d70aef2c3ce70a5e3c986387e0fd14d26be15634d WHIRLPOOL 57a0166e8afe9fe90ab22db691380d51b76b43b78ba2ac2b7ed63ddb971154458ea232294fd62facc8b8ebb9b81fe74878705a9bee142ba38c613c03a72e08b4
 DIST dlist-0.6.0.1.tar.gz 5655 SHA256 85c485d7b2d347847f4b8f49d9ec054d57703ef666623b62042a15f8996e0823 SHA512 31f692e14f0bdddbbdec985e6e5b0262ac74f0d03cd97c77427bf5552e58f2f79c20d8f4ba03479b45dd3f54a1d141a275928878d1b2a9eb71c667745f8bd5e4 WHIRLPOOL c77fe0ae017f9dff3b1061c4c1a652994ffdc53419ed8d7a1e1b60aaeaf7890567ded2d8cc72b4d58365792f36c30b8f988509330bc5b2709454661f95cce2eb
 DIST dlist-0.7.1.1.tar.gz 6161 SHA256 08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd SHA512 e6c3e2ce0a03a7edee7f98801c0b16d83481f15656b9e0182c9e6bbd9824dad63725aac584cbe4519d02d8fbc6ec083d98bce0ab999689a7a4719fdf7e4fd81b WHIRLPOOL d8e10442cf05cc09eae6de15296a8c3395c77dff4bd779dd87df7d1bfef22b2b6d7507b0c3588798dbe2d428bde02d106890257f23ec4df2eb34ebeaa20f1717
+DIST dlist-0.7.1.2.tar.gz 6301 SHA256 332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783 SHA512 471059e0a4702eca3c5c9457ea1179bf032ff48813776a283a0993abfb713e25fc12a0171b44535729f2c241dcb69496273abe9dbac181af5ef4404be95d5780 WHIRLPOOL 80827ea6a28623e60d81d507d4bec6c54d2b3d8a22d97ee1a4f3b09407b27ae5eb43f3c7d0c332283b8fb04ff1315d949dfbda1f3e546f67af6c83905055bad4
 DIST dlist-0.7.1.tar.gz 6137 SHA256 d9f5609dc1aa9756372a43f8f8414be6380e778754c8e7986a54906317186a8e SHA512 0cb9408c0e7e30baa0489439858e4998d17d16c8c120ff3f84c8e256262110770131a96337020456ed4c4e224cc4a80f567b3f4afb0d0452a622940c4dac635a WHIRLPOOL 1203e47a9e51089c60465533af0d61faa2d30b71dfcc9ad56904f546ce7f8b1bbf80e603fe2160cab9c4d3ff90cf531d11e0901901332d231d24220eac36aec3
diff --git a/dev-haskell/dlist/dlist-0.7.1.2.ebuild b/dev-haskell/dlist/dlist-0.7.1.2.ebuild
new file mode 100644
index 000000000000..dddbb713215b
--- /dev/null
+++ b/dev-haskell/dlist/dlist-0.7.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Difference lists"
+HOMEPAGE="https://github.com/spl/dlist"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 )
+"
diff --git a/dev-haskell/fast-logger/Manifest b/dev-haskell/fast-logger/Manifest
index a77b6027a048..14b696e845da 100644
--- a/dev-haskell/fast-logger/Manifest
+++ b/dev-haskell/fast-logger/Manifest
@@ -4,3 +4,4 @@ DIST fast-logger-2.1.5.tar.gz 6016 SHA256 ea47bd770560df55a25cfa5b9b9b440d9f36ba
 DIST fast-logger-2.2.3.tar.gz 6235 SHA256 034a0ab0c4ce8f6d1ad6e7b8e46da84c64778681d25b0405c1cb6af05f30577d SHA512 25771b8835f5db985deee37e35aeae9cc01155f61018f99f31663d8bb97b238261b2cc0c1e460d966bca9355d7a772a4431ce811585da20f7496cc803c427f73 WHIRLPOOL 386562bd28ea202529454d1a77a3561077822465efafe3a765bd5bee000a3609000868bbc28cfe39221e415867b60b3a884bc83a0be8979f767e6950e64cbc3b
 DIST fast-logger-2.3.1.tar.gz 6059 SHA256 31ebf986082ea8871f07fa7638ca956d80a6fff13d89d423612047298cac550b SHA512 e0d05921f4deb1841290e0d3c97a68f7a4b69d5c1fed451b39390da48e3947264c0f1f601c8f07abbae0f9ca06c5e78cd2aa8e5478c1cc839c6f997ac99a16a0 WHIRLPOOL a824ec47f285e55b8e26a6e7b0c2011da884429516533a955fca4b8d137833a23cc3b809fbe4b1109eca12cad236b9d9eba5b8aafa466f4b39b50ecc357b36a6
 DIST fast-logger-2.4.0.tar.gz 6159 SHA256 4cff4e1a38b07ce18083028406c51efdfa6d6764104c4f2fd4b7112c28cd05c2 SHA512 0358bf0f703f359ac13788165692d8ddfd5a61c9d535d0a4f8189783197d1ade24d23f68058be8f8760dbf8de2d2c9cc7aac7e58c08c01302e6b6786c3c32acd WHIRLPOOL 0dc0d749dd9edd6df7bc5968aca7d3dccd302a6bfa6be2c30bd97f052b6fea2e5f6fb633c014f9115664fcbd348f35e14252d14b3b15da8672808aa4d0331cba
+DIST fast-logger-2.4.1.tar.gz 6211 SHA256 e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e SHA512 a8a37c4640e7f5e048833c672f62911826c298bc474b79947a0dcebe91979ba0bfab362d07ac0e92cd81851689bdc546b6f8ca7df030a6fa6c55193c8ba146d5 WHIRLPOOL 041bc5d9c9740ebcea3c8f12a6c0fef593b7f1867bcb5d3e714c66d86ed9d9a0e826a9d9daa5cd9295896ca28da5b7ced942f509e7a1887b7bc5db92ea0088da
diff --git a/dev-haskell/fast-logger/fast-logger-2.4.1.ebuild b/dev-haskell/fast-logger/fast-logger-2.4.1.ebuild
new file mode 100644
index 000000000000..3e6a8b570b0a
--- /dev/null
+++ b/dev-haskell/fast-logger/fast-logger-2.4.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast logging system"
+HOMEPAGE="http://hackage.haskell.org/package/fast-logger"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
+	dev-haskell/bytestring-builder:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest
index 5f3662c3adc9..89bd69035cd0 100644
--- a/dev-haskell/feed/Manifest
+++ b/dev-haskell/feed/Manifest
@@ -1,2 +1,3 @@
+DIST feed-0.3.11.1.tar.gz 101392 SHA256 ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983 SHA512 29c310c4d206c4a6088c3fcc242faccfa57f8337ecd54b5eee30f892acacadd519d65c66e490b55bd91d0e9a39540ae77a2ed10e8e260e6de750a44ed9132ffc WHIRLPOOL 016a2b62e91fd5a4cd56fbf7a7ffb8d0aedc89eadf84792bb3ba358deac4f5731804fe5dd7e59ff3f3cb8bdfc60ade84aec0646c28b149788eb1d1c26b1989c9
 DIST feed-0.3.9.2.tar.gz 73353 SHA256 ef1d23d130b766186a0bacd6e4807279cab681712b0fb09d1ed1ee1b3c154f17 SHA512 36e9d75d7bab4c26967d39a20c1b8382a24f2f5059dadf0425bbcc16a659587a842f948a456d63cb32660feb4d7d56ffdf6aead7ec5c40abb678b9fdce25ff0f WHIRLPOOL 953bda571eb1f8e8925459065e52e8759db5253f433f82427c3ff246c0ce3d3cf3c26a04a751272d216badc64677938bdf1f0fb309c9007ff8c115680036bb92
 DIST feed-0.3.9.7.tar.gz 76042 SHA256 1468425b73887fba6740ab3e64ac62473be5f5ec61de17c5e1ac8812d4f15a07 SHA512 340d0889f98c329e116a6c785752f675c565a959b787629bf6ed0b31ce9336aaa402e9a008c72c040b6f91988657381580eb5ae110a8a6b441ebacfec362824a WHIRLPOOL 764aab94d7fa4885012b29dc39116654750e04d72efdb624d1efec70be7ef133326a9422ba86cba12e4de8f103c774e58c9bb93789e50b24f0777ec4d5e6fd4e
diff --git a/dev-haskell/feed/feed-0.3.11.1.ebuild b/dev-haskell/feed/feed-0.3.11.1.ebuild
new file mode 100644
index 000000000000..88c638b2a5d3
--- /dev/null
+++ b/dev-haskell/feed/feed-0.3.11.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
+HOMEPAGE="https://github.com/bergmark/feed"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+	<dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/xml-1.2.6:=[profile?] <dev-haskell/xml-1.3.15:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
+"
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index 9bb7b746fcec..86ecc4c1021f 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -1,3 +1,4 @@
 DIST fgl-5.4.2.4.tar.gz 36574 SHA256 ce98ccb83e2d271a7b3266426a0762a0e902252f07ec09b7bef50c67d0110266 SHA512 9c0c145f43d1b5671af99e9d62d485c5af1336779463f3e9519e6db98fb3c3dacadecb5241aca2e9326ad795d143efd1b3b04a5cb21077dce28579f430fd8d11 WHIRLPOOL 570f4c1fb03bbd3ed0544e44e64bfe95f4ed797718cd0596c0354e0a862ac23e8abcf63112a60b1356a2e980095998a5ad9e919e5e7a6973507eec46e1c6dd48
 DIST fgl-5.5.0.1.tar.gz 35963 SHA256 aa61664ba38db3e54124b702b1ee92a72a569c981b759e48cfb567078b038763 SHA512 0f2b5224e36291ca044bce512b04e1a87e30f8d79ae76bf4f4725d15b26079521c012085125c92ea3133da5d6318595245d4b321669e772f88cabbc90b4a468a WHIRLPOOL e5b0886e1e0a9ba1a6f79bc5f72f692955587d9d3d5cc5c195990fd9a1c040b30f2dbdd00955e2abfcf5b157149cd71a077a2a87241773db05f4c4495f24a3d2
 DIST fgl-5.5.1.0.tar.gz 35160 SHA256 ead9d3f94aa32fa35a0246cd14fe0b853e197e124a3a0712913c644f3bf89565 SHA512 0047bb766d3202483f692cc6ed50a17e12cad9afa66b39986ea3012069a6aad4b48c0e8d9401e5242160989adb46ce299ac42b2c6ea0907255d60659e62bb084 WHIRLPOOL d287de2288616ff0f90e0cfff0174004f332c6306beeaeb1550c4d3fac9366706c1129b2b54c0dcb9cc2c2fdd730812e85826c8234e4cde6e2977fe31136d4c1
+DIST fgl-5.5.2.3.tar.gz 52223 SHA256 f4113b5221917feb6389494bf8b7b6221ee00f322b6c25fc25a25795549f9e20 SHA512 4e092048256704e852f13f59046313df83cd00f37c5c32daf69ef13d1ab680296cdcd2b793cbf7383225ecb3caa5c5a1e6110c467d67276eaea6041942856a33 WHIRLPOOL 838f1e9f66d7057775b4f94fdb93a0643ffadf0deaa93dc069f7c25d8f75278bcdc960b627eb62ec9fc698f1ee21453364d7cd3777b558c07e85e5250f61271d
diff --git a/dev-haskell/fgl/fgl-5.5.2.3.ebuild b/dev-haskell/fgl/fgl-5.5.2.3.ebuild
new file mode 100644
index 000000000000..45c27ed259b1
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.5.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="http://hackage.haskell.org/package/fgl"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9 )
+"
diff --git a/dev-haskell/file-embed/Manifest b/dev-haskell/file-embed/Manifest
index 99e3413d194c..14a84251bd42 100644
--- a/dev-haskell/file-embed/Manifest
+++ b/dev-haskell/file-embed/Manifest
@@ -3,3 +3,4 @@ DIST file-embed-0.0.4.9.tar.gz 3975 SHA256 62632b7d267be7f130745258949f5ba8abfab
 DIST file-embed-0.0.6.tar.gz 4204 SHA256 ffd5e6c4b538b0b95bca74b05ce343faa3b127fa53cf824e9d8833b42b7ae329 SHA512 d7cc0a94520056119003380a3a0383e1e0e578b528d2165cb485030ced8a6ac0b1388c8b0ad0deb79a589e0adca90b38de00bc97292faf754c3f491768afa3d0 WHIRLPOOL 9e18ecb839068037fd66cef3f17c8982487a70a9af3c2a1d667c3b7cfa758cf2361d347666df2fff70c56ac5e45fef870b02403db78e8e2d27dbfdc7d624f78d
 DIST file-embed-0.0.7.tar.gz 4283 SHA256 4f4489207dcfeb5eafd699e51442ad4e49f535323c95cebee4e8cce4c0714856 SHA512 ae87b0df303261d7a36d1388c7d92f021e36e58feece5f9a12d55fbc16a74aa0553fda2bbaaf34e819108d39655997a44d8b473b48de1b410b00a993de439b26 WHIRLPOOL 532111829014c33835af96966398f0d328b5e5136dc9014d4fb033979c51c4c799c27d48a214eaf9d19ff69ebd0e5883c19ab1824eea3e88080884fc7b7354c2
 DIST file-embed-0.0.8.2.tar.gz 5425 SHA256 9e9cf8d84d5213924eec9d9c829655db74ff02b24a797d5f7450724244fabdbd SHA512 fa7674d708c99098ae2a113de2d11a9f954366fe06b7b018b2715ff96e859967b211a3475c26ec04a63eb66b13e21274969212b8689ae57dd1c150a409c9912c WHIRLPOOL 8f595ce6c98bc29da88cb53ca650c0cc98bd365aa65125945340b5ba9a2647ac7d3a9e5ec3940c27e3f093a8038422db64855363336360f21f495e5e477aac50
+DIST file-embed-0.0.9.tar.gz 5624 SHA256 58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005 SHA512 897ebcf06eaf6e5ba0c08763adf5f5c47321599cac884e856bac21c178b9116bb3117bab89bb5a1ed2369711a8998c37c2daaf6f7555c403c55c09c5204ce1f7 WHIRLPOOL 8c7dc9faf30d13ccaa6792e82913b62d7a363e67b532f4a16f9aa8d3f8e0294dedad1029da5b6ad0f1c404ef1e455d86121016f0329efc93c2bfab174fa80b41
diff --git a/dev-haskell/file-embed/file-embed-0.0.9.ebuild b/dev-haskell/file-embed/file-embed-0.0.9.ebuild
new file mode 100644
index 000000000000..04d7a5ddfd24
--- /dev/null
+++ b/dev-haskell/file-embed/file-embed-0.0.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use Template Haskell to embed file contents directly"
+HOMEPAGE="https://github.com/snoyberg/file-embed"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
index 572748b42d56..3905cb34765d 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -2,3 +2,4 @@ DIST foldl-1.0.2.tar.gz 6961 SHA256 046d94297d1c122ef773a5d928b6832459cfe1c91851
 DIST foldl-1.0.5.tar.gz 7604 SHA256 88801b0db30cd01a49ea9fc03b45e3859dfac5b6c82d0ee787259c47efffd223 SHA512 ccddcfc1634b6e462bb115f2191d5295127dc302b0fd05a34577844fa5de1ce2813078429e7cea2108dde2faef987da47584b65d92fc5dd588cd1ec0201f8105 WHIRLPOOL 881146d750ad13ea5ed8d7ac16e489223bbbc647184970fee025455add81fb1f0ea4c96d20f946607e2fe64c24eac6b3bca55b9e7519156690672d538000399a
 DIST foldl-1.0.7.tar.gz 8533 SHA256 4991d3a39f10459e47b4c094327e93d437e299cd6225ff57b4d8d1ece28a1d57 SHA512 b2dd75560b48430be67ba11503b7f639739ba83e340a93df37a04f729d42e4fb06c46bb7fc878855737848de67e40988a184d78ff4500ac8d21890ccc112b033 WHIRLPOOL c77d8dac6572b24d1018b8a93251347c4c64bbf478f78875f422375511343bc1d6e133057c3dd0967e2624b4af62958b3d8104714e2b4bc2a1cd3899d96e41be
 DIST foldl-1.1.1.tar.gz 9544 SHA256 ef49feba75c927ab2a6b9afcdbe7730463ed379f1681ae12c15a1608c7a2f807 SHA512 36c51b4a406ae6c875353e3238c51fb2121a5b834149ba2fadd509682caf98304edf2413a1ee9aaaf602c894efe76995f084a54a3ffd9ed71979ac8b93fa2e27 WHIRLPOOL e54d09725886ff36b712ace877776687d24e3724614973e756e6822cd574631c35560a77bc3df4f6e40310804d96f08d334bca1ed41cb110bbc4eb268b3a179a
+DIST foldl-1.1.2.tar.gz 10388 SHA256 723b62642b0dd95f0fb8e87102552c76755ad18f300c3429b43fa7b56213c17f SHA512 05e5019f78fcd1c34e50d812149ade29948d587a6c5c0ffe561497334f10be7e4c08eb8be44aea14f4b9936986867bd6ce0dfb513d194b712b342b068a7f8e17 WHIRLPOOL 9b1ebbcd819f81bbefa47ee52b7b8340f283d1dad11a375655ebf200ee5e642df4cea6402886f2d87f448e47dcb4f7cd63627b43490e72119c5b82179f023dde
diff --git a/dev-haskell/foldl/foldl-1.1.2.ebuild b/dev-haskell/foldl/foldl-1.1.2.ebuild
new file mode 100644
index 000000000000..485d816a0adb
--- /dev/null
+++ b/dev-haskell/foldl/foldl-1.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Composable, streaming, and efficient left folds"
+HOMEPAGE="http://hackage.haskell.org/package/foldl"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
+	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?]
+	<dev-haskell/primitive-0.7:=[profile?]
+	<dev-haskell/profunctors-5.2:=[profile?]
+	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+"
diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest
index 13e4d08f361d..cd4f4f94013b 100644
--- a/dev-haskell/free/Manifest
+++ b/dev-haskell/free/Manifest
@@ -1,6 +1,7 @@
 DIST free-4.10.0.1.tar.gz 46324 SHA256 78439fbd8b9508bc886d38763891a4b1de0942fb86827f1496cc2eb61640406f SHA512 bde1fc1b7ef1d3b51eba55b5122df5a6a694fc079d536e427ae9bdfc18ba6c4224d126d55b66b62d6f77911561201622c4f24434db8c1897a8e6713dc83b3531 WHIRLPOOL 0c73a59efdc27e1b9ede9a002f9b0b01b1fc63ab15c3cdf4fdd0e5f7c53fc2a6db46835488da2ff9575d126ebecad69e3a1b6c85ddf7add01df55f458ed676ed
 DIST free-4.11.tar.gz 47937 SHA256 be40a10bdd58dd991c84126465d93dc6a75ceb12fb115ea9d02a78ee8d2dc44c SHA512 693fdf0d639b9446b4081159d768aa89b42fae351458ef007dd479a1de58a6d84f2e58cb9f0a4393617bcf8078484cf00abd78479c9add5beb20b072c7cd8298 WHIRLPOOL 5fd77ac2d0922062ed130d782cfe7e227c27f6b78ca102ba07d7598200f409ab0ea4f1ae52e594d86d0986a009347f03b4808b5872969b24bfab14b9e28242cb
 DIST free-4.12.1.tar.gz 49736 SHA256 376559042204e56bcd1152f04bf01079118c6ccba5e0cf8344de929537bc286b SHA512 2d80e34d687934542501d3ebb97572a22f8a66d6940e34b72d91617d10fb713a9498393285d8c34d6d70fb57db9ba632b3a1292cf659444715888f24ac6f48fc WHIRLPOOL 46b4b8521a6fc2eded12db6b81c3997b00a3ef51e7e6888062c453ab0846729c7a0ac917c4f26e9e335a37feaa54a54b18cb31344892774635d74c18c85c5647
+DIST free-4.12.2.tar.gz 50496 SHA256 9b65172e90ff03d4daf1d533ed5e967d8a24286ac5facc1edd05e203fe88461b SHA512 7433364aac3c60ce657c5d3b83ef27f6dbc67342c29b9b6841261d10f9a9e8869d0ed60ee889e69c8b54c2ca85d46d41350f8669ef2e9ea0995b099c9e1e6b55 WHIRLPOOL 5541364281cf0c593e8d8948e4923b92504635891cb9f09237fdf7f8d48c34a8c1c9da76b933ba03a5c14c4beefbd1511a59608203e19fc10d3ec96fcaeee1e3
 DIST free-4.2.tar.gz 17972 SHA256 cbc1f6e0b004567e252c0cd2941b2dfa5db07be180c098a13619a98abb19533c SHA512 9f5d124c783bc43399d787c5f233f873800e121e7c9e0629b528dcb4e063e37b12b44e5ba74ac3731cc77949de72d76641a47070e0237c9e02f16137a80ef96f WHIRLPOOL b1fcba3759fbcdf79c6a775351a759f77867704ab15b3885125c44224af6d160c368bbde682e36ca5541282a4eb4219659773a98dcfb2b1340e9ebd0be85b758
 DIST free-4.5.tar.gz 22856 SHA256 7d0b8126e52fea4fca27ae745d6a8ee81c74526336bb5547ebde56c805a08d41 SHA512 a7ddaf84dcf2dca584e487f8c9fe633a18b14201217142192784cce516497bd338abfdcc861c9578937b0b123ab737288062ad32fb1981c2eb97e88b0942238b WHIRLPOOL 41ee888059420c531f3972725f863cfd1064e8ffd288833d29a57fbfbc3fbbbbe72cbdeaa224a6c07fbe8224a9a69e0bc471893f55cbed954cd05e33cab34152
 DIST free-4.9.tar.gz 43414 SHA256 dd3292f587e96cf5337aa7d46ca685bbeba34b6f1632555482f39298ba4aea06 SHA512 1e5c49b7e3e61a8348520522f6bcbfd04e5187c31c391eea30793baac023c9c939ebe6f44cdad0a71f099f137fbe3dae73a31652dc8cef3cac5ce9b42d461b67 WHIRLPOOL 4a1ae1772459817806418bda94d9c79b388cd42897c2cbb96f6dde6738acb3f51de829bc5b2b1069f809f2a73421959c2c69d7b93e9b09781c674f0c1fd9c0ea
diff --git a/dev-haskell/free/free-4.12.2.ebuild b/dev-haskell/free/free-4.12.2.ebuild
new file mode 100644
index 000000000000..ef56984605fa
--- /dev/null
+++ b/dev-haskell/free/free-4.12.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monads for free"
+HOMEPAGE="https://github.com/ekmett/free/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
+	>=dev-haskell/distributive-0.2.1:=[profile?]
+	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
+	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/gio/Manifest b/dev-haskell/gio/Manifest
index e63b17223829..777c8f72799f 100644
--- a/dev-haskell/gio/Manifest
+++ b/dev-haskell/gio/Manifest
@@ -6,3 +6,4 @@ DIST gio-0.12.5.3.tar.gz 79099 SHA256 8cfbfe99d3c019d8f804717ebaefdbe6bccc95238b
 DIST gio-0.13.0.3.tar.gz 79391 SHA256 c5e915a1d718349832a634d3127a206a1abdebdf851443b4dcf78568a42c0294 SHA512 231c7e8096351329b1a293a34e4f0da0887bf9d44b12a3506e270dd5aa5f5ad0f6de91f81c011274ffefde9d5f7a47476c4df63769d5fcd6ee89a0f4653adcfc WHIRLPOOL 7b01e6958d4c8789bb104b46797700cff4fd71dbaf62f398922a56b11c0b999e04195acfdcf8ac0359c734c746ec5ff9f666af027f7a3d593665ea9779fdb951
 DIST gio-0.13.0.4.tar.gz 79430 SHA256 4a36b8e183660f8c093c99ec198021c630cc51bf31d7c7267a6fb2fc28e556bc SHA512 1a7b5d3120eea078ca37b8a286cd03f44cb869f74cf99b69d3e2c3ed1ae720cf6e34986b61aa8d90183d2342acf35763a48dd2dc56e3489187bfb3b6fca8bc2d WHIRLPOOL 0fa99cb172dbf62d78e23dfbc91ecbb2332c40ebbc0c0450b5afcebbeaa006a044c6b0e97bc5d918eac9efb65127312c82aafbb34f59d98ea4e04c32df6fb3f4
 DIST gio-0.13.1.0.tar.gz 79367 SHA256 b274b121b7814d25e0125f3129287a2407c83f458731040297a6fc6ebf6cabe3 SHA512 520c6014281c766bc6330b2821fae2a051b6807b2a1e21b4440899aaa02c77f51eac71b9b3bbf4f29e7330e3981e8c42dff44cc364f602f37e5b552e11c46f3f WHIRLPOOL 7d2c65ad61f699cb3fbfb49037e631b3b60baeca933940756206bac62e282a038740c65e80155c767a979e29c85d21ffbc0990c86ee6e9316ba470641913e801
+DIST gio-0.13.1.1.tar.gz 79378 SHA256 d04d9b87b43bf12c5917ea561da403f80fe955adf735785ea8afa0915478113b SHA512 7256450cc3bfe5469ed304ea093fef9ee11033331e2520c9deb420ff725d95c5ebfbc8cdfa24d3138a1799b70ca178b8d113957f6e09b871f270c0af168207d9 WHIRLPOOL d23ef298667e33db3f6e22f54cdaf4287cab868d4dccf0a668319d1ae64ffb9da707b3f880466f5641e83302dd4682a1dd69dd0b315f86c7c9613bfa860f2253
diff --git a/dev-haskell/gio/gio-0.13.1.1.ebuild b/dev-haskell/gio/gio-0.13.1.1.ebuild
new file mode 100644
index 000000000000..7f92d5a519cb
--- /dev/null
+++ b/dev-haskell/gio/gio-0.13.1.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to GIO"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	dev-haskell/gtk2hs-buildtools
+	virtual/pkgconfig
+"
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index 6bd7d85e76b2..7096aae2c234 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -7,3 +7,4 @@ DIST glib-0.13.0.6.tar.gz 47966 SHA256 3b434abc2d981f183fa022d57ec14cc2fd880cb74
 DIST glib-0.13.0.7.tar.gz 47988 SHA256 fe5fb5339a7694c915a388bced3b8d934d78cf51c5369f348fa6f52815dea69b SHA512 357182e65e913323e6cee5709c117152e0fe7ffe3171adacbfa5f553904a9ac98406f1f246b37ea96fdc097235bbccc902b3b4fc459e4bf0c09d92c51bad6791 WHIRLPOOL ad710086350abb4a9f0257b7d52f23b9a5cbf1b560243e5a0384cf2d082bf464dc0ca7a7ba35e55ed86b967d805307c7b3d209de468f0b9b1faeb4dc545df79a
 DIST glib-0.13.1.0.tar.gz 48157 SHA256 df1d250f1f2aeba208b7cb71f7201189b9939f6a5224739e35d94a5aa3d84c87 SHA512 5268c0ed455e5664bb0473a43eeb47dc3da6ee0c522fe72b17e5837f109a791f1323db0c843cc4e32d9804ed04e61e0a4a93f99b857d7badc79b233dd906ad5b WHIRLPOOL b2ac8e6f5798d94ef281d02fa356823a71a7007c61b92d0eb79a9f84ffadfa377b20ca59482f1841b8c0d8625efc9cee5d4db9440edc06f69bfa3ba9e91a25fc
 DIST glib-0.13.2.1.tar.gz 48651 SHA256 9763884736aa7ef2f0bb9e716aba5f87d50e6d068134e486f359490b8112acdf SHA512 c3d42c9ce4e0fbba24dd7d0ddd01040afe853fcfb3c06c9452f24953095f350ba21824aa32ab59f8bf7638cbd0056939b3a6e3d469fb83ce9100ab0017711139 WHIRLPOOL db98f95e618d926d67f09971bb28aa38a1455d20d299cc75c4658c93e4f7c86829e2fa5347b7b29bf68c1208a4f71f75111ee982393302c5d78f0a021e3feabd
+DIST glib-0.13.2.2.tar.gz 48662 SHA256 16bc6710ac195778e514c6ba1da3b22a057854d4db0929b4835172ec42e0497f SHA512 97c49911cc53a1a01df4cdacb0aa715b41988d3689a7dbdd2c9499c9a4858497f3deb6fb492394751210899af5569efba2171468417c5961b7fb73863ce652c1 WHIRLPOOL 65f242aaabc0958e9c49946fca1bb74c5e79f4c2d8f8b7dcfef39b7de5e946961474b630b37317985f8ec5c9225a9248dfb60d66ad9befc58a4cc706e5a72d29
diff --git a/dev-haskell/glib/glib-0.13.2.2.ebuild b/dev-haskell/glib/glib-0.13.2.2.ebuild
new file mode 100644
index 000000000000..6287f65782c0
--- /dev/null
+++ b/dev-haskell/glib/glib-0.13.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+closure_signals"
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	dev-haskell/gtk2hs-buildtools
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closure_signals closure_signals)
+}
diff --git a/dev-haskell/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
index c4b3699d01dd..e504c7ef56e2 100644
--- a/dev-haskell/gnuidn/Manifest
+++ b/dev-haskell/gnuidn/Manifest
@@ -1,2 +1,3 @@
 DIST gnuidn-0.2.1.tar.gz 16392 SHA256 67744c8559ed5c722c53c7a4c2a37821b59ede4b9288ceb995410ec6cb3031ca SHA512 f22ab90cf21b01c899ab61e231afefbb97f1f831a0dd8c32c405e381f3d3a01864c1208d0867d09e773e05d5a8a69d1f8303e35337ea51ce1277a47f9574e1ae WHIRLPOOL d1b7260905be95aa4611311570d3212d215d9c85b9e8290f6b0338583895896b26cd6ac2486e24f280929a6786889573bddd8496e8fcb8d69330e34cbf45db2f
+DIST gnuidn-0.2.2.tar.gz 17534 SHA256 61346b1f764cead5633bdc83f7dc9836b1627f484984094cdffa95dfd365b96f SHA512 4ac894ba4cc4fb9fd90ccea55fda342cd0dadc863a091d31287b19117ec1e545a23b7fb69db02bbb8ee9eb84856acb51f3ab0d7778f4ca3da290dfcbc7ef27ac WHIRLPOOL 82747047470eaaf17e8764b5c760aebbc503fc080372a857c6bb33f6b177b328016324105156be8f60f7a9297ad918fa35efe82ec4b0df3dbff48dcc8328c59c
 DIST gnuidn-0.2.tar.gz 16389 SHA256 edc77ef09aed85afac49f42c08c07fccde7211a9c7310996aa94d3f0c7156776 SHA512 df8a93169d187de905e096f26a3469bc86fcc304696782d3bdbfb76dea0119958d0365e3da77380c69f74029d3f1e652204b3edd315648f3fbef3e14b2fa6854 WHIRLPOOL 86bb909aaaf36e859e16369ce638b90129e7790a01d9a419c00b00669c1b691cc51f28c37292292621bcee1066498095c4f3f1a7e32a59d254230e57d91f07be
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
new file mode 100644
index 000000000000..76b788719a66
--- /dev/null
+++ b/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings for GNU IDN"
+HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	net-dns/libidn
+"
+DEPEND="${RDEPEND}
+	dev-haskell/c2hs
+	>=dev-haskell/cabal-1.8
+	virtual/pkgconfig
+	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
+		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
+		>=dev-haskell/quickcheck-2.4 )
+"
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
index 5465a81a480c..c531ee7a1a2c 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -3,3 +3,4 @@ DIST happstack-server-7.3.1.tar.gz 78692 SHA256 04e7bf14680c67118c27b7332b46e206
 DIST happstack-server-7.3.9.tar.gz 79473 SHA256 9fb66700374db5455853db778c086549345150c7e7fb5e60f09e16deeb145a82 SHA512 3bbfa96e17d5e452604c81f1322a3dbec9a44eae76c448e6a79843c05a079c5d081d58a7d126d8bd2957d774899b6678eeadc17fa161f58046296299b1a1c7a2 WHIRLPOOL e6e4bef2d5926513c9b6f25aa1fecce75215cc5cf65ee95dde5ec44e1292345ca93cc556e9b3f64559e7533f81d80861512a8acff54264fc5e3ec5177ce0a59a
 DIST happstack-server-7.4.2.tar.gz 79838 SHA256 2fbb9b29ac6c3c70919aedd64982793c1d13e5dafbdfac155360c307e2609d3b SHA512 e6d3795503b089f23de745628715d016d54ad6222f14ca6a5226d572b56a60c03cfb37e8898d8afc3283ddc60aabe637ae646ee97657a45f72a5bd719cab90e7 WHIRLPOOL ded751a2ab4bf4fbbe57f76cb4b1806379f963a7d25576be55f1823ac93ca141f5b0c425798f71f690aae23291f8d8245a7f95e2595a2ce79bf442874b6c67b8
 DIST happstack-server-7.4.3.tar.gz 79969 SHA256 e33cf4da5677f69525714cc2b5aab9b7024d52a4571bfaef0bba571a622a4346 SHA512 db44acbf80b095abbec129203550d67cadea6e30e407b6e19116b76e658b9cb81637e3de84d4194c87f44a001e47ba428d518d7c362bab4f623c7989131dec92 WHIRLPOOL 55ed894642a6c8045384fd7a2449d6c6b6a8f6966e3542918c5ee1525414460fb42b1a17cc38e92bd82872c889d0f3187193e56947decfcc1ede595af8d0695e
+DIST happstack-server-7.4.5.tar.gz 79941 SHA256 704a11b50604e57bd960633a73baa77fe23993f41b35202a0e26f4af2f91dc96 SHA512 52aa4261abe1cea3211add541b6831e0d586dcfc1e24d6d22ac7b69c10fd26ddaa93b2582ee586d9bb8dbef88b7f2e135f874a5ac65d0085d406fa6fa7a6b618 WHIRLPOOL c07e9e093b64aa97ed97fc6c4ad85ca0254b72978e259a26f75509fa8911fe162f11b10150c0de069c5c4ef1d1504d5954c36710837a36dd213edac34d4be390
diff --git a/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild b/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild
new file mode 100644
index 000000000000..b173be7640f6
--- /dev/null
+++ b/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +network_2_2_3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web related tools and services"
+HOMEPAGE="http://happstack.com"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +template_haskell"
+
+RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/hslogger-1.0.2:=[profile?]
+	dev-haskell/html:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	<dev-haskell/parsec-4:=[profile?]
+	>=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/system-filepath-0.3.1:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/threads-0.5:=[profile?]
+	dev-haskell/time-compat:=[profile?]
+	>=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		--flag=network_2_2_3 \
+		$(cabal_flag template_haskell template_haskell)
+}
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
index 52220ecf3b7f..d87ee896a44b 100644
--- a/dev-haskell/hashable/Manifest
+++ b/dev-haskell/hashable/Manifest
@@ -3,3 +3,4 @@ DIST hashable-1.2.1.0.tar.gz 22389 SHA256 4ec07479fe37174e694b8d54cfc2111648e325
 DIST hashable-1.2.3.1.tar.gz 23845 SHA256 d5bf53df132e56671a3a4533c89324b327e1b47181b3961cffa87f5aea6f7af9 SHA512 e8518490a89aa42c283adbda038754a2d0ad4ebcf9c28fa5203be69616f9c6d12befd472874d34e3892d70cfa6de6e0f5be9dddae9b78a8fdfb83106074825d3 WHIRLPOOL 7ae107a0bf4710b1d558a3eaa05ac0542c29fb4cf8353366fd8afa64fd60cf1ce47cd6dcab7706f5ecbab11186509af88b6786668cae9c9b122f9ba106314ece
 DIST hashable-1.2.3.2.tar.gz 23903 SHA256 8c66fc70f75c5e1eaa8278c2c624a8cf5a73d5127df1cb2956eb69b16f492241 SHA512 e5c646881ebe3c73c598ee4c24f5454524867c823137702ab3010b346ee8dec6b93623834838e43413d19d97c3c011bcc54e915d1055d76f90d2315fc25a600b WHIRLPOOL 0ee669fa904e45ae9d9e279c55e904470646ffc782d5953a27e0f92bc35a0c9b961a552b3a4816d8a5741c38b8f7fd59678cbe81e4ec4ad0b00edef6c05cc3d0
 DIST hashable-1.2.3.3.tar.gz 23944 SHA256 fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e SHA512 f2e693ecdd96591b703f584b501818215379ce56e8fc7591307fe15d2745d1eb7d2ca7c130dde84a66337c81089c783f227f6215d868958caecc58bf996c7a22 WHIRLPOOL 8177001510bf326787f3af676d4f62796bc5371a715ab6beb3604fac77a64eaa74ffda449dfb2c69200afea964b380e549c5c9782ea52c8ced8f32380e1f30a3
+DIST hashable-1.2.4.0.tar.gz 24491 SHA256 fb9671db0c39cd48d38e2e13e3352e2bf7dfa6341edfe68789a1753d21bb3cf3 SHA512 992027ce617e347414e328e05afe69b8621fb1af21fef58836761d2002a1f9f7f97c981ff3c4fe8699a1da124771df575717ed4e3fd0bbe5c62d81be1322dbf6 WHIRLPOOL b1c783aec82470e4af78d2a7d3edafb69343a8f73a93ef3f32871066cd48226e973cebc07891836f2e6256239404c4c76e2009fc3f16c74e1714a5e4d47ecebc
diff --git a/dev-haskell/hashable/hashable-1.2.4.0.ebuild b/dev-haskell/hashable/hashable-1.2.4.0.ebuild
new file mode 100644
index 000000000000..f0d883d7bb52
--- /dev/null
+++ b/dev-haskell/hashable/hashable-1.2.4.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
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A class for types that can be converted to a hash value"
+HOMEPAGE="https://github.com/tibbe/hashable"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 +gmp"
+
+RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4.0.1
+		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
+		>=dev-haskell/test-framework-0.3.3
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag gmp integer-gmp) \
+		$(cabal_flag cpu_flags_x86_sse2 sse2) \
+		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
+}
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index 0dab379be858..87f2c19b17d2 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -1,3 +1,4 @@
 DIST hashtables-1.1.2.1.tar.gz 48553 SHA256 c50d910fea2e81eca53d9a2dfbc925246be5b7cc2d0854c6d9e95eaab05ac684 SHA512 87739d4021b705e40982e66925400eea38efd2f2a11dc46626f33d2a9c9287a5a323d93c82d6e8415aef0434350256fda80819a4bbb58ff2afee74ed755c266a WHIRLPOOL 26fd049380d0dbdd959eb2d778b8409bc901f307db8e65c26193b1abc70d6d715ffb47fa6ef1343d60897fc580f8f101d719a547f139dadb3a3bb51da5ab9bd1
 DIST hashtables-1.2.0.1.tar.gz 53093 SHA256 329d700e716b18a2cf1a75669104da3a773091a7e441c5470c202d4c439bf0fc SHA512 5677ca82aafec488ae1801363a3c58f173f5e11a92ac0c8991c08f0da5128ef62a66ade391771a99f8a6a339057ca774591e146667237a2a3bedc283a3a1684c WHIRLPOOL fa26257fe461177f508bd0bfb86be8d9355bae0f20b228c8a779939158acad95031a6a1032a8b28d8977c7e56efd1e1d02e4354b2d0bfde39c4433e26add5eff
 DIST hashtables-1.2.0.2.tar.gz 54283 SHA256 012be9fa5e91118b9301ca58138fbf45222119a284d5561ca6f7e3f9b42e1837 SHA512 8b6416056c56acfa81224506779bf47626373cdd70f39ff8fd40a11a474e2c45dccd3a7a534c45265d275c1cc13cc6a0d657c8f9f1c1f5fda8fbad98d9043739 WHIRLPOOL 2c3375ac986d348e6a1ce3dcc199ea491ee991e51e42f0f9e02e726539cbf69de4d5e5e6b926c957d088f4174b368cbe6c0a8a958d63a6fedfb1a6dd6117f77c
+DIST hashtables-1.2.1.0.tar.gz 53706 SHA256 ef5122c8f3b72d1e817a4f2adb410ad88b30818934a276b7184790697f4fdcac SHA512 2c6cd17434402ff963a1b3357e58dfab3d4b60f5a2848b5433dcbbc1705d24707eacfc36af5dfb461ab03ce678c0736f3277292677e8ab297b306bd14e797e64 WHIRLPOOL fba19771e0d875430571aaa8e72666e2d4355554217ecb97a4611525f0e01bf4f6ba96e80c15e5c514b4ac8ca34271ac6c8bf63086e7294aabb60279cf77ca9c
diff --git a/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild b/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
new file mode 100644
index 000000000000..3135ccef35a5
--- /dev/null
+++ b/dev-haskell/hashtables/hashtables-1.2.1.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
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: sse42:cpu_flags_x86_sse4_2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Mutable hash tables in the ST monad"
+HOMEPAGE="https://github.com/gregorycollins/hashtables"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bounds-checking cpu_flags_x86_sse4_2 debug portable +unsafe-tricks"
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	|| ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] )
+		( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bounds-checking bounds-checking) \
+		$(cabal_flag debug debug) \
+		$(cabal_flag portable portable) \
+		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
+		$(cabal_flag unsafe-tricks unsafe-tricks)
+}
diff --git a/dev-haskell/highlighting-kate/Manifest b/dev-haskell/highlighting-kate/Manifest
index 8c29d5bf1e29..e9268e879238 100644
--- a/dev-haskell/highlighting-kate/Manifest
+++ b/dev-haskell/highlighting-kate/Manifest
@@ -6,4 +6,5 @@ DIST highlighting-kate-0.5.5.tar.gz 668017 SHA256 4943b59d2ebe23c73f028c449cf973
 DIST highlighting-kate-0.5.6.1.tar.gz 686899 SHA256 43742a5809e4a525dc071d6c55ade7fb3c5bb1730c4f00be68f6970ee3f29f43 SHA512 4e7f3c563bf9a8066ddb9ed2ea3f6660cc6ccdd5c788972ec566d03a6ffe393dede7066c3a8af36f1722785a2e33e6f722cc1e4b78a7816118cbe803b7403575 WHIRLPOOL 663be88b43b55c99711d19f907d2640c098ab4a96e41d3320f975e6b24aeec0226245e73e91444ac3fd7218c6d4d1da531f2714effebf7b34e0514d8d4265dfa
 DIST highlighting-kate-0.5.7.tar.gz 720037 SHA256 8463dfdc2a7f6a0cc78c35ac7b425ad57aa2f19b9ed86c9043f657d2cf1927eb SHA512 4e57bbb96ca4f32db115fab3e8ea0145283f13d612a1585de16a75a00ba2ab3b903103c33cb404d42d5455c10dfa476bb6c72ebff8a87bd4805727e1cf73616d WHIRLPOOL ad4daa5dc60c69f94b9512a50bb4a498a4d7d5c6921008d111bf6dea05661db080295f6730e5a888a95a38228543bd4d84929e4364c3c424b0ba8a1e87f90da6
 DIST highlighting-kate-0.5.8.3.tar.gz 722279 SHA256 ae8e2e7837314a6fbf19af0f32a0cd97401fb112c4572692ee30cd5dcddda90f SHA512 78dcbe3ebdd8d8bb1d90a7dff9d0f149dfaf2a41d17cda557ca65331e015180b9a534a966933b44b3972e077a6ae06dc7b812eb3f4891af6d25b0e360e3fab9a WHIRLPOOL 20c763a58500bb2d03fc9020036fdeae54b1952f38d2c3106beccf0546615dda9a741278f7b71bd22eeea08b8a8bc0f6837cce024566ab7a442aeb63173d9545
+DIST highlighting-kate-0.6.1.tar.gz 913389 SHA256 cb57caf861bda046043575772ffc7fd4cd21dd63a0ecdf26b624c7e930e0f30e SHA512 c7b0696acaee1e7679582dde6da0bd0d46a573955249d4b6b1455ac9f29839daaf0dd9c7f2b2229d335d24fd512c802e268cd96b9b6ca2a7509490b1e66ab774 WHIRLPOOL 94675d3a68d2528bc09b6a31511fadee6bd8301fab25e8d10cbd0635e916fb2825e2e0c9b2f927aaa5cab75f19c450b68b009f8486b8688b12e74a696e740377
 DIST highlighting-kate-0.6.tar.gz 922847 SHA256 b39dc194386eb7613a5e9935023b1173010800c3a9b0b7fe09c0601f97236398 SHA512 2042e22299735e49e45cb34f2807f883da91c98ca3fd37cd1698f5d1cfea49df79cfb8da6ac9664aba0629c5500e6cd9e9c812d897f59b9bd75b2a5cd5c12933 WHIRLPOOL c0246332c3bec77a405041f05c6d7771be6ba37035768df6e8c6a3044e88e06625d4e7aa7aae2288f2740cd2b5009e31fe01ac94216c3040fa2cd4c79695c201
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild
new file mode 100644
index 000000000000..eebb629d5473
--- /dev/null
+++ b/dev-haskell/highlighting-kate/highlighting-kate-0.6.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Syntax highlighting"
+HOMEPAGE="https://github.com/jgm/highlighting-kate"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable pcre-light"
+
+RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
+	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/diff )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		$(cabal_flag pcre-light pcre-light)
+}
diff --git a/dev-haskell/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
index cee68eaaec6a..f9898d9856f6 100644
--- a/dev-haskell/hjsmin/Manifest
+++ b/dev-haskell/hjsmin/Manifest
@@ -4,3 +4,4 @@ DIST hjsmin-0.1.4.5.tar.gz 110730 SHA256 e440ecb77f79c9ebe0ebb7ed96845b1048c5c23
 DIST hjsmin-0.1.4.6.tar.gz 110739 SHA256 795fcd1bcafffd609941d1a773928a52ece85dd6479b7260c2931953f9fb1c7c SHA512 a045b88d64655d72bc5e5970879d25f0be2617700299656f11c25370f11ee28f38838b4d1990fc80d86396e52414ad208f35bd436d5ac8760979fbb9002dcc6d WHIRLPOOL d8799c162de5a4f09027e3c34979e613f72920ec967575dd28cee4ed57a5cc78a592c26c8af2b1d43ce40fc209ac35712e15382bb4e1012483dcce046d35c9b2
 DIST hjsmin-0.1.4.7.tar.gz 110718 SHA256 0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf SHA512 c23308b109d1f6f0f2ff877c63cbc8fbad14adf520a80d0760743a21dfb5635a5e6bc9024ef856d77ed78bb3fdf77243164b4282d597b55ec987aa36b9955e07 WHIRLPOOL 18c6edacea415a81c3487b2012fe1cfd5fb86e68c62f2259ffb66bf2717fd432cc888d2c71f23f68b987f2b37f740c98e211c36cbbb6ff66e2e34f52c4810d1d
 DIST hjsmin-0.1.5.0.tar.gz 117050 SHA256 f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7 SHA512 b2776566d6040e43329da63003bb95ab7ffccf43f6cb70fcd3d7605eaa139454bfff7376bbe717a16e224875d616d03819a434c139fd9ac23841985e088e3d6e WHIRLPOOL 3584ae7f9149184ec6d5cb0b5843852c36f8688f8a1c84df19be349341019662e61cf5cd3d0e0f761f36c27e4769ffe498b6b6b824c8b3f4f61541c5eca5c582
+DIST hjsmin-0.1.5.1.tar.gz 116938 SHA256 d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff SHA512 e157246de9d80f6ca877d9eda185bb37a2ea0cb41fa147f387abd9050d0c5c8deee54a3caff5da82a3207672465908c9814dc6fdbb70e8fd77095af1257d2ae2 WHIRLPOOL 44aa1dd8ee8bcc7865acb1e7a26842bdbd7fae45fb72b0c270e3e3f2800851dd5279a33f7c57eb2ed86da9478c10ca0ebd68e0dd493c463c9f4375a7ec40cdf8
diff --git a/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild b/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild
new file mode 100644
index 000000000000..bed92662e3bd
--- /dev/null
+++ b/dev-haskell/hjsmin/hjsmin-0.1.5.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell implementation of a javascript minifier"
+HOMEPAGE="https://github.com/erikd/hjsmin"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
+	>=dev-haskell/language-javascript-0.5.14:=[profile?] <dev-haskell/language-javascript-0.6:=[profile?]
+	>=dev-haskell/optparse-applicative-0.7:=[profile?]
+	>=dev-haskell/text-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( dev-haskell/hunit
+		>=dev-haskell/quickcheck-2
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index 4d433c3a1bb8..0125a6cee5ad 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -2,3 +2,4 @@ DIST hscolour-1.17.tar.gz 20801 SHA256 b645cdde1b7827dae1519a4423031b4c6bed82a8e
 DIST hscolour-1.19.tar.gz 25466 SHA256 7f9d2cfafbd300793686fd4e9f4ddb3f6463f300a22129db898db47956689f9f SHA512 8f2a9f16cf82fbe41513600c210a0d3af58f1b06ab1ed14a2493203cfce20a8ac959b3a34966273277ac3ceaf3b4916e82892880dd7685f8de12b2636bf53ae1 WHIRLPOOL 051874e224c5fdac14f122143ddfa9577bab7cbd1142ed97f57801204f2df2de76141dc31241eac53c02920d85895f5c57f02b81c5648725d76b1e34133eebbd
 DIST hscolour-1.20.3.tar.gz 25810 SHA256 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853 WHIRLPOOL bb4f56404fb4c4f6ec563005ed1359276b0c16c3719dcfe0a8479cf62128e010b868836c55927e5d1a9d3f2ad5045f4f9d93516502380975c8cf71fb1d3e0878
 DIST hscolour-1.22.tar.gz 25979 SHA256 3c8fae274c63d4dd6bce8fd3017be84e4bccc50585900eeb792c0eb9efee15c7 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0 WHIRLPOOL 6f4a636964cbaff83903511b938042e4b475347ec1bfe421b2a484a66da557b55093303b559d83a25ab31e17ed4266841adb95c9e3ab7b777ab8bd2603268cc9
+DIST hscolour-1.23.tar.gz 26027 SHA256 97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f WHIRLPOOL 03dd2e658f3cfed1dfd1a429a698a58ecaa0239d4bccaa19180ed60056da8e7da09810587e1d53e38ceb521ae1cdf1d601d3856ad9bbce4d8d07aadff430ced0
diff --git a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
new file mode 100644
index 000000000000..de818018461a
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	# llvm-general-pure passes rtsopts
+	haskell-cabal_src_configure --ghc-options=-rtsopts
+}
+
+src_install() {
+	cabal_src_install
+	if use doc; then
+		dohtml hscolour.css
+	fi
+}
diff --git a/dev-haskell/html-conduit/Manifest b/dev-haskell/html-conduit/Manifest
index 25181bba1cbd..59264491f8ea 100644
--- a/dev-haskell/html-conduit/Manifest
+++ b/dev-haskell/html-conduit/Manifest
@@ -3,3 +3,4 @@ DIST html-conduit-1.1.0.5.tar.gz 4048 SHA256 560bac7c5601554c8958099cc7a0035af27
 DIST html-conduit-1.1.0.tar.gz 3789 SHA256 a3d47dee8983828688bf9ebceccfa256c3bf1414664010a79fc82e48efc9b386 SHA512 e5a901fad8fb71a08492554f799251dc265fc9b7ef706ba818ca40b9e5622792393f62f0bd0976e5b5ce87939b2f1807e8e2439cc1ce5ce55848d36393cf2db4 WHIRLPOOL e00100eec1730f4aef796aa9903256a0822bbebd6df4d3fa14bb5af3b9d989e100552ea97a4e986d16d7f2aac94abe0f05d067230c6f5abcf61250e818d5d6f0
 DIST html-conduit-1.1.1.1.tar.gz 4004 SHA256 007098771875594e797a3438836ef6361c7960eb99b0734835c0cce3b50359af SHA512 fc69c595f97c952d624cc8a22597d6f966ca343dd8f6b9c5da8085ba9a7609e1bcfa803dbb705e9911c5a86de7456331226080869a04a56b69ec36f4ab5bdb50 WHIRLPOOL 387c6d8f8c421bf3be6ca6d2b5b200ac851644e67abae9151c9d0612ba493b5e6fa96e1623e04100076bc7bfa3c45f52ad06eb7143e6ae588a88c43505fb6d9b
 DIST html-conduit-1.2.0.tar.gz 3905 SHA256 751096080f961a44ac3c2d93274dfa5fd4e047d215af33734dd325158e16404a SHA512 622175d3f916cdcf12b8f6d024dfff010d9376d58d2eeb9abab1311b8b347d2e207e0e849bcb2ac366f0c11d891c5c99d94cc90f526c00e71c997a622e08d93f WHIRLPOOL c33fa7beb947cf27628a3d0740c23eb2b1093c6eba324e88a3f17bff17f8d5475d915642dcd32340c1cb08dcaa7cfed5ff36fdbe947289bcb3326dab4ed72e0e
+DIST html-conduit-1.2.1.tar.gz 4117 SHA256 bb1c76947268fd5661918d02de73132b50f364d92f0d4e331ee0e0c87e0cff29 SHA512 557dc27479cb83cb958839ec29faca4997ff52f848430b5a3c20f17dcf388c76848d0c83db376077f8a6f192312e124d5b0e6b86589d40053e1a657ca96ee5ac WHIRLPOOL 514a96584e9d8e1899a930773b8a91594728dc3259dc716ada513e2f352a2abfcea6ffd0c4236d9bf1a4c35b05adcdbbd148506882d9c76763b0fe81583e107a
diff --git a/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild
new file mode 100644
index 000000000000..0935e3262e29
--- /dev/null
+++ b/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
+HOMEPAGE="https://github.com/snoyberg/xml"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/conduit-extra-1.1.1:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/http-client/Manifest b/dev-haskell/http-client/Manifest
index 026c93e8363f..97e8ae895511 100644
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@@ -1,3 +1,4 @@
 DIST http-client-0.2.2.2.tar.gz 29315 SHA256 91f642fbd612587ff088973e6aab6f59a8199d5068fdc9eb1bcea1b5f046c3de SHA512 c436a275848d4bac7d44f56b033303380f5b6433ab0064048c6e47977192bc81c2ae66b629af573e743274895797bfaf8ebd5c19c67c7583160508ba20e0597a WHIRLPOOL 0dd13cf62f79c56e5738dd5018dfdcae3fb18d4b9c49a1eda221a2ebac475ee4dcb03ee43524c0f9b844914bd005e98c2fb8996e2dc152c1926162490ca96dd1
 DIST http-client-0.3.3.2.tar.gz 33517 SHA256 67cecbfcbccf53c4a1287aed3f22a6cfc156640ace4f6ed004ce5166e0fd020b SHA512 7e05ab5f3c1a02092c1431f532a41cf032c791ea527ad84ee5d1e6ad9fb61decaa5b8e1f879099c47937c7c48a96961ee76d688fc42cb19878c6782922ece91e WHIRLPOOL be2de3b8215990e14b7711e0049541b619267d817fafb27c038c5f124a553f5e74959458d4609a74d3cc1650d7e18d8abf1a04ad57af1939e3ba29fc9d8cdfd4
 DIST http-client-0.4.18.1.tar.gz 75796 SHA256 69bba520e4719b5f2b1f2ce5bebea441d082691b76bef37c9fff410497ae156c SHA512 22b04e04edda5d0ae017acfd6b332acd9347d722245642f02caced4c60baa3b00d14e495c1b8f82e96e9c071acc045f0ab3f17b93706c95b81658a43489ac9f8 WHIRLPOOL 388790b6e17c7b3dd4e2cd002c21fdbd606e3e80d8e0c6d96cc1fcdd634e42a95d03bc761df66b7d03d9e7e6ec869f559c5859b44488a4501a3c154d2df42892
+DIST http-client-0.4.26.2.tar.gz 77508 SHA256 5c06c7944da2489d0abb91f8807418e013e77610d2fd3245641f1235371e8c6d SHA512 7d57a6bee97fac2b660fd05b206c3cfad1f521ba584b5f004317a02cd757840bf2d68294083acaeaecafb38bfd3ad7117563c9726f10aecb3867ca3eeca6ec35 WHIRLPOOL 6cc928bbd2d8ed7df5e8f713b4e622f32e0c5be5247b01469f89833bf87526f9e3fd09701dfe44db02657ac5f0b3850d766a379d6d575549a1d5925bd017f44f
diff --git a/dev-haskell/http-client/http-client-0.4.26.2.ebuild b/dev-haskell/http-client/http-client-0.4.26.2.ebuild
new file mode 100644
index 000000000000..ff4317ae68d6
--- /dev/null
+++ b/dev-haskell/http-client/http-client-0.4.26.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.0:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/exceptions-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?]
+	dev-haskell/mime-types:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/async
+		dev-haskell/hspec
+		dev-haskell/monad-control
+		>=dev-haskell/streaming-commons-0.1.1
+		dev-haskell/zlib
+		!network-uri? ( dev-haskell/network-uri ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/http-conduit/Manifest b/dev-haskell/http-conduit/Manifest
index 572d8428c114..a8fe3a3c14b1 100644
--- a/dev-haskell/http-conduit/Manifest
+++ b/dev-haskell/http-conduit/Manifest
@@ -1,2 +1,3 @@
 DIST http-conduit-1.9.5.1.tar.gz 46601 SHA256 c2bd9c8bc5bb8f3de8b8c0c299d664db8e68a4bb24b658c768b6839b5cd1a3a8 SHA512 2e2ea0fbd15ed07de5e4b114ab67a68cfbbae9862cc78b9e4ae98bbd06a79e3bac1cedd246b148e6201359aa10a8ba5a6e8800d6ce1238530ba52ece3e135f00 WHIRLPOOL 96e8386157074d58f5492afe30020964b2a8a861be7fd0ece5d0c765058646ac1efb5ce5494fc42b885549374eac7134431508ad237523a5ebbe2d64aaf32978
 DIST http-conduit-2.1.7.2.tar.gz 23333 SHA256 ccd5d034d9c1f185ccf600e7f6d6153df793218233683ba073bab62d5449dc46 SHA512 020eae7a5846a880270b24d85ea4e7c2742c0f701e9e895b4dcaa1856f794fd00e09951e171104a173679d062789e5214ee24e0d63984e7d94d2cb2e5e7fb0ce WHIRLPOOL 10833001140438370ef01d3207562851c38339993f5d16d8c21a3c3c2627d94fbb0d38bccf2004a059ca2702d5567ca259cd9989cd0bf6776cb97073acd23652
+DIST http-conduit-2.1.8.tar.gz 23331 SHA256 550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d SHA512 a5791e9cc9a5d8a077a54286e163cf16b388e1c1a71f31989e731ad724de887d96bd985805380b3ad7ed8d0570c8577c38bd1a36567ee38924487c7a200d304d WHIRLPOOL 4671a0557363c9170f28ab947e48a1a38d830c8b2d2843be15bea42db2cf192e20492ea9d22f39bca9826b01b8144a16d5914a84f0df5721a175c5768bab2d89
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild
new file mode 100644
index 000000000000..8d0f1751186b
--- /dev/null
+++ b/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
+HOMEPAGE="http://www.yesodweb.com/book/http-conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/http-client-0.4.19:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/blaze-builder
+		dev-haskell/case-insensitive
+		>=dev-haskell/conduit-1.1
+		dev-haskell/conduit-extra
+		>=dev-haskell/connection-0.2
+		dev-haskell/cookie
+		dev-haskell/data-default-class
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/network
+		dev-haskell/streaming-commons
+		dev-haskell/text
+		dev-haskell/utf8-string
+		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.1
+		dev-haskell/wai-conduit
+		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2
+		dev-haskell/warp-tls )
+"
diff --git a/dev-haskell/http-reverse-proxy/Manifest b/dev-haskell/http-reverse-proxy/Manifest
index c925ec024007..743781d39b0e 100644
--- a/dev-haskell/http-reverse-proxy/Manifest
+++ b/dev-haskell/http-reverse-proxy/Manifest
@@ -3,3 +3,4 @@ DIST http-reverse-proxy-0.2.0.tar.gz 7478 SHA256 546544cdcf800a90944a480add99bac
 DIST http-reverse-proxy-0.4.0.1.tar.gz 8839 SHA256 30fc8eadde6efb2dd0548087d55f5baae63558d1442c5efbd0d978dda7afcf3f SHA512 f48d0ceb23e02864270fc75e6b882cb27c6b9aea6b52ea0878413adc717af60a6c42ed526e06d437ed27a588c4ff2a8b25223d6dbddec3a17df5ad54e9f9acec WHIRLPOOL ccb4e458f5cbf2fff8c866654442c939e98f7e772161d6c5997c9283456699eb88eb487f79ec1923bb7a6e65c6ce2ded307f346cca4b77d25ec64d375b8fbab1
 DIST http-reverse-proxy-0.4.1.2.tar.gz 8837 SHA256 9ea3ef753447c7cd4d74258d14eae26af8830c47f040a0e6eaf53c0468b1efbd SHA512 295245b6922b1b358fef6de5853286df10247cf89cfae29b1763581621a4e9fee1c4da97b41ebb2d4b1b11fa683dc1d98a6f818597979631ae6fbd22261a80e3 WHIRLPOOL 97c61ae655e287aa901c90afe6fcb7bb3cdb117598d56744a5dc655edd9b26dbbba099d8becb21096f75f75f85705e138c346a0d54ab742a4badf4fbbc5f2f6d
 DIST http-reverse-proxy-0.4.2.tar.gz 9641 SHA256 3118eae07425ee5e44fb309f6a99f09d6a4fccb4965cc6af2ce5ba6003348d81 SHA512 c7b8de49a849913a3ac30c4a627ad1efee34909eb86f27afe6f2f4a6f7fb2e122f3a0535b31d3ff1f7b2a255c10f81c41b3ca346e3e4e38d0f23db753500cf08 WHIRLPOOL a30e2cceafbfb0e32766767b3fbb85b8fcc3020b54fa377962028cd7b179b9a1fa8e8c037fd867f6b1a112a2b2873132948906413e1f18e62c822fbedd46f1a4
+DIST http-reverse-proxy-0.4.3.tar.gz 9742 SHA256 4776b8bc59dfc889ce932223f07f236be89840c3c47cb91b7fd3fb47d1cddf45 SHA512 72326d46c0f307a1b9f31115aa7286ee4a562f0c8f513b87533a74c59df482dac3c3ce87c50dd86fdbeb1f31b13da8218f1455f6f9585ad4763651e8037a9d8f WHIRLPOOL 400511bdbf8f2c93114abbdb787fe869073d721543b9235bd0eb97cf7f0d13bbdfb5fbec8138d3684b1dea3bee0c0a6e35db4fe9e82254eb632652d668a41a43
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild
new file mode 100644
index 000000000000..2ec2b028c94d
--- /dev/null
+++ b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
+HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-0.4:=[profile?]
+	>=dev-haskell/conduit-1.1:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/http-client-0.3:=[profile?]
+	>=dev-haskell/http-types-0.6:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	dev-haskell/network:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?]
+	dev-haskell/wai-logger:=[profile?]
+	>=dev-haskell/word8-0.0:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/http-conduit
+		>=dev-haskell/warp-2.1 )
+"
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index 61a62730e1ed..3d091a77d57b 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -2,6 +2,7 @@ DIST HTTP-4000.2.17.tar.gz 69706 SHA256 a9ace28937d95951d3137ee29b87f11d0344bd41
 DIST HTTP-4000.2.18.tar.gz 71165 SHA256 93c8228f7521cdd85d0c0521071dafb037e0abbd55dbcb2516a341ded68cc0ca SHA512 3141daa2732bfe013f7f6a8d3017ee9e56d377af5615e1686c42acea9eb52b4b9c2212b3d3550ac2ca72b949b6a7c2abb8fba8f5669fe60fe176dc133ea3fa9b WHIRLPOOL 4713a5e4623d7f31773f4be81a84a3757ce2f1819985710927849fff1edd1b46ab2b8d76c2b7ce96ebd6d25152cc5fe09c6f4c37c81cba20aeb945e9e2beb8f9
 DIST HTTP-4000.2.19.tar.gz 71287 SHA256 5ffb97b7a916a70e742d65273e4c7c7b50b281797db11e17e7e02158e343f5fb SHA512 f7133c36a86e71c5a44fea8f7c92b66aa0ce2b1a08121eafaaea6a40e8a00720e2c6130407ed8cbc0085c26a279bc8dc4affddbcf7d7aa93cf05ae9d1efcbb79 WHIRLPOOL 89403d27070d3cc6932d08b7095921eaf124cee239de0c70a77e438de2961f1efbb381ae96c7a389a75234e961826c062cb8f667d2cff1979124fd63f10b406f
 DIST HTTP-4000.2.20.tar.gz 71475 SHA256 4407cc863699720d179b36257baf21b5f1df4be8c30545dcec4d685a726fd85b SHA512 0f5927f0cfbc638c7ebce738c4f7b460b2c0b40f28dc137909c47f05dfea04e975482dcf626425f23f90f131689f1c03d9f8dc7d834e61b9e389a92f6c64f8f0 WHIRLPOOL fdebffd0a3d5b411c52717f964591e8a0b0772094044551656953bc0b4a60c7334a19e6fec62ae312ef15c0db0ae16e11b051dc245081a4b5c3ed4dcc626eea6
+DIST HTTP-4000.2.22.tar.gz 71609 SHA256 3e212c927aa4524b95425fdd6500c06d3dea145c5b3f46ce6634bc1d1769469c SHA512 20ff5dfc5c0ba752395c187f66b0dd0859d5fd199522fb60b8b81c8f219fe1a03c1112929917ce7305e76e4a9e6228632837b13815f68c3f6f2d8abcace0f9d8 WHIRLPOOL f711da58ec6ad392fd732ea44e4b310ded5727ad5f09ad14fba2090ed07c12fd71251494f629e19252dc0780f7d91c57736f6a0973ab491e771f89b5c6d1d06f
 DIST HTTP-4000.2.3-test-suite.tar.gz 5117 SHA256 0487674fc7892754931df4e3efffefb9ef492dc8378179be287ea89fb3809ca2 SHA512 2b19171cfdb27d078091e15f9fb7b9ed56c8cc76f8a116216491742749b51e469b313523c49b1e693ee5cb4f9e28302661582649cce7d8d519a2044dbd933163 WHIRLPOOL 8218fae860e50d73524b7b95884324506fb95829cff6656ea46aefe84962252be8187a7bfe460599e3a1257469dd5a72221df24c7fa9ff6708e1ef2cb00a94f8
 DIST HTTP-4000.2.3.tar.gz 60708 SHA256 00f59f751a53a0cd766d59cffb3a97fc001189797861ce4aa28d4bea672efafc SHA512 ea958e1dffbc6e12b587874ade27deca1a9451a6fd9887c04659ef63dbbdf489ddb77da3d517c325575349db2bbdd362791adf8221498f0029316df7c4813102 WHIRLPOOL 2563901137673867c1a839aaf23b2c62ddf6c7bdddf50bda290d7da08dfdc5774fdc09298c7f921aa72be60c6023afecd1d4cdecf9a7ed12de7dcb9876c8afd0
 DIST HTTP-4000.2.6.tar.gz 66546 SHA256 22e5c2836a72b41b8df2947d881a24efd72dff38a3afd99fce3561966ce6cc67 SHA512 390ae3ce9edbeb47efb38b3bd1b6a1a4f12e2392773ba76c5df0f22f4277f6d22beecf1115b67449fad7a4f76779bb309fce2bd2bb8b932c9ea68cefd3b02610 WHIRLPOOL 51dca79305a4ad6332d915a59dce8a462eacdc22fd36b3886c1119d7fb9a7f4e7b811e5055820561fda83f69e92f442c0948b1a89caf09fedf7e4475021a3c20
diff --git a/dev-haskell/http/http-4000.2.22.ebuild b/dev-haskell/http/http-4000.2.22.ebuild
new file mode 100644
index 000000000000..47e795269586
--- /dev/null
+++ b/dev-haskell/http/http-4000.2.22.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HTTP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="conduit10 +network-uri"
+
+RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-time-1.0.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	dev-lang/ghc
+	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
+		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.4
+		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
+		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag conduit10 conduit10) \
+		--flag=-mtl1 \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-network23 \
+		--flag=-old-base \
+		--flag=-warn-as-error \
+		--flag=-warp-tests
+}
diff --git a/dev-haskell/ieee754/Manifest b/dev-haskell/ieee754/Manifest
index a320121b8081..580f74c6444f 100644
--- a/dev-haskell/ieee754/Manifest
+++ b/dev-haskell/ieee754/Manifest
@@ -1,3 +1,4 @@
 DIST ieee754-0.7.3.tar.gz 16219 SHA256 603fc8470330abd25b4c46d63536cca75ca4d282acfefa565fddc612e021073f SHA512 5c2fbb6ae812a7e034212997043c9a2f284a2a7c2048c4d8650c93cb5be76529bc02738522e5899cd5a1da3bf72710e709a8722d5025009a131e1a97e9815196 WHIRLPOOL f4e9a3a74e1875831decd753e605f012525956b69357a3bfaec303e2105b8d41b4748147ef7f75027da9ed0d238878749534535ea04c7019390e0fa1f83448a3
 DIST ieee754-0.7.4.tar.gz 16242 SHA256 30bc11aa71a8d1df28b5c84cab57eb363298443ed6a26093416cd720949babdf SHA512 ee38e3bc80f1c891034d7407a79478c2ebd8777586a51c18f5fd95b836868a9e9fda5c670d81dc7110598b691933d4d3f4e1b56de31116ec92e5c63bdd878da6 WHIRLPOOL 0609c28d7e960f30c5f94263c766040bff78d21d75285c978a7061e1fe66be4461e426471caed9c4472b4f8df9d35c6a30b2e8f74e1c7e0c15808b6088fb0273
 DIST ieee754-0.7.6.tar.gz 16787 SHA256 5840644e8adbb243adc63d112c8bec3c3996af21a6c1262ce30c1e2b1034450f SHA512 e010ce341deffcec742d6ce1238962e161fad0fa17f444d4324cae0dbf81dbcbbb942db214ec7898416c20e72af8811227d80acb148fb09a5c430c51f86920f4 WHIRLPOOL efcefc951540c967be7792f1487097d9d34c52e9f803df95aa6e66720430f6d34fa6bc1eed5ec0124b313c67b5c270d651d8fbada59c824575d5a719e06882ae
+DIST ieee754-0.7.8.tar.gz 17290 SHA256 de4aefce42d903a3016cba4c7ebfc70d4fa0a76f8c04014c7eb3545b9ab56eff SHA512 662ed7c68797164ee5f0cd3132da96d8d9032aa23037d57636281fdc4952a7c276f92deb032db60663ab1c71311fd8d3088265fc03f772f271dcb659f3e9b866 WHIRLPOOL 3867f4f98d5887f0878194fd65e126a161ef9225e53b1dc6b1cfb4b6bf6de6eacc65cdbe836a43d833abb9e2a90aeb657e77d29e3363bc671b25093b6f0ce0c9
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
new file mode 100644
index 000000000000..eaa5e95ce7ce
--- /dev/null
+++ b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities for dealing with IEEE floating point numbers"
+HOMEPAGE="https://github.com/patperry/hs-ieee754"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2.0
+"
diff --git a/dev-haskell/juicypixels/Manifest b/dev-haskell/juicypixels/Manifest
index 18a9a8689b19..0fbdec5e2f50 100644
--- a/dev-haskell/juicypixels/Manifest
+++ b/dev-haskell/juicypixels/Manifest
@@ -1,4 +1,5 @@
 DIST JuicyPixels-3.1.7.1.tar.gz 96433 SHA256 5751e984068e7a325f6b45a3d00f827aee49e4e63abf2a84a9b6c3dcb09d1a56 SHA512 c5ba19641b61789cd471e0de038c58712989945bfcd340d769f4614b3fd7b1f6073349a8b48115c6a9ca83cb8fc813f715e55f08acd230940ca04084210ffccc WHIRLPOOL 55ef29470528c301012192cb30535e56342cdf9190207a0869d83bdd6bda1c48188582ab3589ccf8375e7a57c294403314792422ecc78717d28f5f65fb8ed44b
 DIST JuicyPixels-3.2.3.1.tar.gz 98825 SHA256 212a11cb158da4b18160a9a2af13b91b77b39edf07ec7e245c5be4097ed900d3 SHA512 e00f01ef16bdbd1a8923202fd1a76f708a81af429c6e1aba968e388a7bcb95d438a082d24a9ed332e9a339eabf72d8a825bf0165507f1f6f0c4c9127c93c2a06 WHIRLPOOL fe2f541a813500290e3ceac10f0041a8cad9826df4caad1199c786c6dc9dbbba50b97b1c5a3ecf21108183cd4dc3f9bb72b538c7afb8649c6346608baae0a0a1
 DIST JuicyPixels-3.2.5.3.tar.gz 116074 SHA256 fc36f130e678119475434febcdfe75e1e083062a4729a3104cc5bdc7972cd8ce SHA512 e5c0b0442b1b79aa751afed9a5df23b9fc1f3bfddd0d7b0f3751053018f4434331a0e0ecb16d2fc36a87d3edd3fc06727cfa9557607a02d7040ead623a5917bd WHIRLPOOL 93322b1b474befddc189e8c5ded6fb5343f421e488c57b4c9108f9b729028278ca807d92e28651b5e5acfbedcc0c3c5d01ad0198f9e347f84a3672efaff6d17a
+DIST JuicyPixels-3.2.6.4.tar.gz 116527 SHA256 6268583fd7915913b3d68a399184bfcfebfaa010be9aa10232d76324df65a6ac SHA512 830743b3a06efb4a39e8b6f44a21c25b8bb4afcb98b55a2e23653786829773ef774ad6ccffd2ee05001972afb594d4ddac20cad60b6bf2a6c4b7fd5a954036b9 WHIRLPOOL 2bb7c588f45ee6cf563fe1787486ad695fab3657faebcff6ca12a41ae098696d0273cd192ae7bafcb5a9464f09efa930bcfe585962ba75e18ad96733aed58a51
 DIST JuicyPixels-3.2.tar.gz 100689 SHA256 c557182da858c467d4992d5753a13a06a29b7f29ecf3b348d932b64f0c0191fc SHA512 5b36b9df42e95dd6af65f4ed1fea42fb859074e8e6fb51b522370f170ab02b5fc579eee17ebe48408579ca774af360eb0af271e05236bb977d83abcdc5115d10 WHIRLPOOL 727850e79c799d911c1fadb26e59dc76ecea544796738e0bb6fec5b34fee5793492c81f52df8f1e3d61aeccd7546aa7d050d30995c00cd38fddb3eb044242b47
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.6.4.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.6.4.ebuild
new file mode 100644
index 000000000000..f64edd1b1e2e
--- /dev/null
+++ b/dev-haskell/juicypixels/juicypixels-3.2.6.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="JuicyPixels"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"
+HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="mmap"
+
+RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	mmap? ( dev-haskell/mmap:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag mmap mmap)
+}
diff --git a/dev-haskell/kan-extensions/Manifest b/dev-haskell/kan-extensions/Manifest
index c32b9e41ff48..6cbd684251ae 100644
--- a/dev-haskell/kan-extensions/Manifest
+++ b/dev-haskell/kan-extensions/Manifest
@@ -1,2 +1,3 @@
 DIST kan-extensions-4.2.1.tar.gz 19214 SHA256 947fe2b7bc9d426620f59750310c12ca522f4fae6bcc6f744cf0072e6d80d553 SHA512 f840ffb527dd6ce6c65fe61e0ae4bfaf04fd9e13495cc970cb03bdf3dcf67c448b27b28a3dde5a1c4f16bb92fed98c2744346274f6834b624231d5ec26e7d484 WHIRLPOOL 902800b0530353be6176a2e2d89b39e59718a1362f9dca811527a1e4e0c7c90a1004756ecc0672330c115a4a693b832f97f0e580c3c2cddc4683e744e72c6d27
 DIST kan-extensions-4.2.2.tar.gz 19235 SHA256 e51d6dd583045b22bcffe5d0054616f2da5880187e4d7261890d7d987fa61837 SHA512 f09219b771cc6286127ba9a488d5aef13a0a994cadf7940e76a941027d8e8a5346bf54a85a1c9b5120956587e906a8d9fed39caaf3b71f5674886e18c6030861 WHIRLPOOL 88b9c71c7e89b5bb5b1fadeea1cf4d87bb9197f925ce4a2c4ebed178b1c56c337e400dc92050978e7eeed7f2ea2cd6c03b632accf91c2018f58fd815459b5127
+DIST kan-extensions-4.2.3.tar.gz 20604 SHA256 334f0edbbf08ebf93c9f7db5473086dcababc6a72d75fa9d8e43237f9b5adc47 SHA512 a06103748320379f4182e3b268fa7015a1ee67c8e62cd8eb2ad2cb41f2fa7f820a8bb4f27a7393027bdca842d924d2a3be4ba141b572f548e6fac6befc5a1beb WHIRLPOOL 9ea1502db5fed0c55f48e660d35833bc1c43895ca67f1cd52609e72e657bf46d58515bbd1baccf8100bd9c559bc39d07c20c9d0a19ee87a7e52e3f4b684bb3f9
diff --git a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
new file mode 100644
index 000000000000..cc0299de87e9
--- /dev/null
+++ b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"
+HOMEPAGE="https://github.com/ekmett/kan-extensions/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/libmpd/Manifest b/dev-haskell/libmpd/Manifest
index aa84b9c7c51d..ccce06cf622b 100644
--- a/dev-haskell/libmpd/Manifest
+++ b/dev-haskell/libmpd/Manifest
@@ -3,3 +3,4 @@ DIST libmpd-0.8.0.3.tar.gz 39997 SHA256 9f4f05d0302816b71645c59ed96c40eab918b335
 DIST libmpd-0.8.0.4.tar.gz 39996 SHA256 0bd3cb0f4a5933ec0bbabeb9de2c90e9a552d468a70472dfe5b3254fff106736 SHA512 57e06fcd9b4c1beefa95c3ff7d15bf9aea7ec92978c36ab2387f8724054ef8dd0ce6f8d9fbb437fd4b0e22b31daadf487463b95393564f8aff049d55084fe3c9 WHIRLPOOL 04e96f0ad68a34e4cfe3e9d7433c9e0da3f45e0cda7876595e7fda2076fa883046ac6bbdfb1239c4f498191d891ff3d470d0169c653f3a926cef5daed682e32f
 DIST libmpd-0.9.0.1.tar.gz 38316 SHA256 2d577d2cad756bda4016af6b03730f19e78ea713b4c44e2585a3801315aa5587 SHA512 eef0e98c38fb1e3ad7c37c245e1b8bbc62de91054eef20f9fdf1b83fdb3949023956b3134b52fa6da6fd19cae669d7dd0fac5e5d7f5d473e7d74145198190309 WHIRLPOOL de81973c0ed5562c44ba9dad09fbcbb7620633014f596710265501b35a998fc67bb4fb6807cdd1af32b239e6a3b1731db4179051ede46c19013a9399aa99c6aa
 DIST libmpd-0.9.0.2.tar.gz 38392 SHA256 5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0 SHA512 0dcafb2085e833608c68b83bcb08177ecb68f08110c1d25e8ea7b2f69ff9fbb85e581280528d1c5a4f3a6c9077ec70105ba9d28bce4276863e91db776c698d1e WHIRLPOOL 98c3de1c8b21c15cbda9388958802f8dd17999f40c021c2fbc5208840177193a14cea91635a0741e840f97bc18fec5134a5187c2cf9e0fd9b99f02bce186e2aa
+DIST libmpd-0.9.0.4.tar.gz 38421 SHA256 bdaa57a410396b2f02ddb9896823ce0a176751fa84261f445e9a5b7671333a7a SHA512 f2c5d300f26d9101cf248c73791f45b26803d13f39472c47109921c82c941138804a80237f359629419001f1d228c2ea199c69cb4421aaca23012d5871b796c4 WHIRLPOOL 205bc08145c794a571c5ff0a4aaaac7c8bdd7a5a9db1e210e75a3295447520d40c7278ae063b22c91e7f87d2dc1ef08ad419eaa0c6c331656de07f105167e523
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild
new file mode 100644
index 000000000000..1dec692416f8
--- /dev/null
+++ b/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An MPD client library"
+HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
+	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
+	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/quickcheck-2.1 )
+"
diff --git a/dev-haskell/listlike/Manifest b/dev-haskell/listlike/Manifest
index c54220af9178..e062d17bed6d 100644
--- a/dev-haskell/listlike/Manifest
+++ b/dev-haskell/listlike/Manifest
@@ -1 +1,2 @@
 DIST ListLike-4.2.0.tar.gz 27191 SHA256 ef9b490d3db539b1f11cdd1e88643e8256a9a4bd4869b594a1e6143bb29c00c6 SHA512 88c045a90fb5a1c3eec0a0ec1b48a2eba207bc87745b2b1a757896b7ea69aee58c89078f7ca4d5c615e124406a36bbe1d85883c96a902db03682a44605517dce WHIRLPOOL e0335332e10d3cb3c002fbce9b994443c618cd5148cc878c474ad71275e838e45011d7e0c8d46baff07090295353bea2629c607211dab5c42b958eb83dbb0ef5
+DIST ListLike-4.2.1.tar.gz 26970 SHA256 d6542ae5bef685e3571cd46b018c5adac2b6c854f72777ddd35a6823bcf08859 SHA512 dc245b4c2bc4fa0ea24efe55434eb8c7b2f2ee1a078fef331997bb0311260732970255fc8a18c9a7f22d90f47f661e543d18e6ad60b8d46992a6e973ccd375ad WHIRLPOOL 53b72d5b822416a7adee130c7e04fe2d7180d130cc073679c323cc9f740ff931800484d458a39ba50777769d2c89a72e7ad35a3f7280cce5d3bce1ffdd5ea5f8
diff --git a/dev-haskell/listlike/listlike-4.2.1.ebuild b/dev-haskell/listlike/listlike-4.2.1.ebuild
new file mode 100644
index 000000000000..a872109efa0e
--- /dev/null
+++ b/dev-haskell/listlike/listlike-4.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ListLike"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Generic support for list-like structures"
+HOMEPAGE="http://software.complete.org/listlike"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+	>=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
+		>=dev-haskell/random-1 <dev-haskell/random-2 )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/mime-mail/Manifest b/dev-haskell/mime-mail/Manifest
index 0ae95bffac0c..4195ff7cd413 100644
--- a/dev-haskell/mime-mail/Manifest
+++ b/dev-haskell/mime-mail/Manifest
@@ -1,3 +1,4 @@
+DIST mime-mail-0.4.11.tar.gz 8918 SHA256 84fa24f83206cb88377128395c2d6db2d08bbe9b568ba6ab8eeb76952abedfee SHA512 576390c99ebfb390a4e3b2c441add80923033d91160aa834ee8b4491e117645d5ce2936fee798370feda8c21c477c95a1984314b28235a3cfcb5f72b2fc52a54 WHIRLPOOL cac9aa21dacb2cbc7a135d24082946835de2fa47d9bbc01058c8ec59a6d94b2b3caaa2114c5a54a480743e9bdc6ec7cf42bc165a61aad661768db789b72e0a9c
 DIST mime-mail-0.4.2.1.tar.gz 6694 SHA256 6f4c64eb0b92fe6f82f715089cc0ce12069bdac3781badcb0aff353241eafde6 SHA512 8058610b7a095899b259c5739038b1241c99ba9981303bd68771c16e2ef742421e2cef5724c6ec011e76f918a5f4ec181c9b31b0a9aea2d42e86059ed8a9f2f3 WHIRLPOOL 95a212951dc4013f28c71b81c5165fbc80f743484ff90c9f5ac9a997fccd866a8093b09e612820fafcd906550da29d177fde3be22995876634ccfa8fa1041ac9
 DIST mime-mail-0.4.4.1.tar.gz 6962 SHA256 80430403f939dace84a0d0ecbb95b55242843e8b3fcf95ba7f9b2a615a9eeb4b SHA512 768a5744b856679074309e952d1d0696f46bbd06c61a82d27485cee75977e44a982adf6ebcc065feac4e7e4ca7413547f66d07a1a30c2476e2c38c340376b96c WHIRLPOOL 77fd582f93669725b0296556111d01774af7e00c006c0af9562a8b87f8541765ac68cbf6d0b3cfc2b70ec9893b15899c748bab20b76e748f31334ba7c6e233ce
 DIST mime-mail-0.4.5.2.tar.gz 7072 SHA256 ee13c0120787f2867fd3d7888de13e34bf3b4c545b5f5c838582d1618190ae68 SHA512 cad5195f578a7ae5297540ac6808fbebde36422e6faf579158abf03cbe1ecd17e3572ae2e1c10085c4f07db95a292b4af614ce8da9705fbb4fa4ba0a761f659a WHIRLPOOL 6306c22ebf7448cac7c41f4ee7056a7d5b644e39d8a054ca23b59585feb1576919275ab08674555ba634749b67cd1720ce705052bcaa39b381a032f062b07e7a
diff --git a/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild b/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild
new file mode 100644
index 000000000000..958fa945dab0
--- /dev/null
+++ b/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compose MIME email messages"
+HOMEPAGE="https://github.com/snoyberg/mime-mail"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3 )
+"
diff --git a/dev-haskell/monad-logger/Manifest b/dev-haskell/monad-logger/Manifest
index 41d095eb73fb..d37151762cb9 100644
--- a/dev-haskell/monad-logger/Manifest
+++ b/dev-haskell/monad-logger/Manifest
@@ -3,6 +3,7 @@ DIST monad-logger-0.3.11.1.tar.gz 7174 SHA256 e78692823e3e691ef6a468af58fbb195fd
 DIST monad-logger-0.3.11.tar.gz 6934 SHA256 b8d53d9193151b2a1165bbac290c3b10ba291f2d4dd7c6066cc018dc2ed9bd79 SHA512 4d87dc32780345c832e6fa64df4a52ad2c6a286c22bc6471c5cf0742e900aaae4e06106711d747ea8b73512a0ab1abb556c18ec22a91fefcee7df24a16641f54 WHIRLPOOL d2531da32ba7db6edd9d060441e9c759be1e71c0d8bc1b84d5edd80327e4dae0998147c1a6df058e38b08889f8c85d307d43efa4a118a15eae6656d9300c632f
 DIST monad-logger-0.3.13.1.tar.gz 7403 SHA256 268b4a6493e86d7a6a4ab18de3bfa9d97bb1d40fe4bca465ee4a084f3b8c8d57 SHA512 9e3f028875b445d67edd9834844d03f6e6603fe34e58ae8d45fca4f8cbe60d5d3f86d2649ab6e544f1eafe74291cbd2f873f4ea56db70a58d756de109691f286 WHIRLPOOL 2ce4434b0dac7da1b594606bc232643bdfc46bf5b71311cecffd12864f945ffaff336fcec0073d78781f9e17e76e1dc233f2cd600932a675d555aba08a7f2004
 DIST monad-logger-0.3.13.2.tar.gz 7402 SHA256 c1383c4d32e1f276e3437db39418d5a4c3c3670c25c416b4f6c3fe5ad4b5e2b2 SHA512 8ab12a351948e657fe56dd8031469b5a9fb1833af71925df9b324927e875780805e924dd3624110e943c825b48fb91f8479de00ba23c9a94be33c996142ea5e5 WHIRLPOOL e03c6a53abc601fbd4277887ea37bdad3708c46a74d5dbbe81800f1abfb2515b176e81faec4c506e380699a1853ffe9c149ba96423974eb650106f1a07a0e28f
+DIST monad-logger-0.3.17.tar.gz 7871 SHA256 25dd1e420c1bbc83b968cac738a08ebc6d708581a6e190f5e61c8de5e698e1ea SHA512 7905a9cec560e3fbe617e28d9a006d744ae6662a23c4f19807a11c0ca409cf4cf994175d528f000af53804b14ed1beceb8e4c7c4dd9b1a480d506e9455a6e6e0 WHIRLPOOL 430eecb531549cecf52bcd085b9c2412f884e7ee95bc070dcbeda2e311906ca294a01f20e9150b2b909953acc19b9b2270dcba4be3938609ff9ea50fec05a0e4
 DIST monad-logger-0.3.3.1.tar.gz 5490 SHA256 822eb82cc1c6890e68caefd498d0a391a5fd76a316c600aa3e5c102a5387b1aa SHA512 777b930f27307aa584f8941f7fce7190b8957b9ac66cb6ce45eda1670c9bcc45af78d09723fc2e9e6c1179da2ebb6cf223123b6405435721fab94c90d8079efd WHIRLPOOL 4465cdf82d5dc16b53c3026601577b1b056d5d24b7123e9054cde257c544f7896cdeeef666e05977dab663889e22516d7dc17fb1f6b9f19a4e16e36833a9b655
 DIST monad-logger-0.3.4.0.tar.gz 5747 SHA256 d62473356cabbf514317f93cb82e7d6716aa3a9284ab958dd08bce8374fdd99a SHA512 63b91116150e864e4148f32f6cb62adcd9cb4be678499d6486e0fac9cb02b67c33622f9601d00fd89e9fa0da50d4dad78d1cb70dea5e418539140695a5fcc684 WHIRLPOOL 40acdcd3853d788b494eb2b8be9a8627fa06acb77a148e2b7150fb8c7832d2e0df054fbbe4ef170fcbf1f3ce20931456540682b41bf744fc8aae4d62ea33864b
 DIST monad-logger-0.3.6.1.tar.gz 6151 SHA256 5a9b17512a70bf10cc737498fa5ce0379150e3cce6d76a07c81127252ecc9a7a SHA512 0ce7a202a0c467cc7395f606dad962fc84dead9feddfd331099bbeb9dfb56089d96f1ae45863af39ea6588d62348a7a989a18f6df18530917e41621ddcda264d WHIRLPOOL eb8c7dfb1ab42c99baeee672c2d9730f3480ca4a32d252368d0db16592f7065bfb3a3915220f7df38ff66cc005258e2c9f01692b854d03a11587ab258e2e3760
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild
new file mode 100644
index 000000000000..15416d5a981d
--- /dev/null
+++ b/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A class of monads which can log messages"
+HOMEPAGE="https://github.com/kazu-yamamoto/logger"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+template_haskell"
+
+RDEPEND="dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	dev-haskell/monad-loops:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/stm-chans:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag template_haskell template_haskell)
+}
diff --git a/dev-haskell/monadrandom/Manifest b/dev-haskell/monadrandom/Manifest
index a3a94afd3074..9bc1d75aa221 100644
--- a/dev-haskell/monadrandom/Manifest
+++ b/dev-haskell/monadrandom/Manifest
@@ -1,4 +1,5 @@
 DIST MonadRandom-0.1.13.tar.gz 4465 SHA256 d3ae5f7c2e9703a31e4b81d4634457073105327a30be373c0554d0a5ab1721de SHA512 c9ceba1cfa28b222ad16329ec0b1e1c5becb255e76ac4d4ea03cc4309e95b7341bae5167d2ceb5a7c2567ed776ae375acd80b07449d88b4b9f89b8c78f958bee WHIRLPOOL dfb5bebcd3c2aad163ba2c2a6015d3d1b8538d090f33bb9cf02bd8c2bff69de26128c4a725219449b27b760adee685392d58fac8883c155d9728a391b3203dc6
 DIST MonadRandom-0.3.0.1.tar.gz 5028 SHA256 40e6a19cecf9c72a5281e813c982e037104c287eef3e4b49a03b4fdd6736722d SHA512 fc4ab8b6fb842a91edf31b3a0cd2abd73e45f46d5acbd9bdce18a1eaebcfe0d659025b8ffe8c7dc91cb2630a8421673bc4bcf96696b94f9a39ae380ccf467fa9 WHIRLPOOL d21ed4608ffa04b06369b4276849dd1ee7bc8f98c3dabde3005ea79db6655102b2049d5da34d241950ab1ab3d3e822b6300440a1f0c6ae20c1645da4fb94a58b
 DIST MonadRandom-0.3.0.2.tar.gz 4971 SHA256 71afdea34f7836678d989cef3373f76a62cca5f47440aa0185c85fff5694eaa1 SHA512 12bfa6ee3aa9c3f2bad4c341b57f383c4b03f3743b74e5646456839198c3479dc283ac00b1ce5638f043bb6b5281a49429220ba57ce722753a7dd9350c8ef003 WHIRLPOOL c822793639b97f9aa9c2c9429c231640b97288f9282ab8e2ee031f08a7f2254b94ff9d6b319dea78256eeb9b6eaeaef9e04f60375cdd15cc929f11e17130fd9d
+DIST MonadRandom-0.4.1.tar.gz 5204 SHA256 71fbc82f2cec58795b28a1c4820127b64939d3fa710e465a86764413b891554b SHA512 faa7b3cac953ca2f8cc3a13e5c18de3b0a05fe1461cd418060f0b6af1e72eb082aabd23827335d244eadb7d634a823969767847872f3eb3ed2a61a926d7e93b2 WHIRLPOOL bfc20dc202663d81c90bdec53a259e8aa26c2f067d12a83f189d764c63c9b73f756a8b7faf52d16e00529dd99162ef9dd61f5a3e58a3dd81c7180f1c8c5e114f
 DIST MonadRandom-0.4.tar.gz 5064 SHA256 d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93 SHA512 ece2dd35eecedd8b895f7132ef78f23fa4f45d130ffa0d4870f43a8601680ae87fa205374a42e0c220bcfc0d0f5677d06524d199d781d349d3aa68781e812b49 WHIRLPOOL 276b3ea1f77f8db1d406d001575c4bbe7c3675eb54a74e3bd2e32f2157f3c630a3ea39aacc7944f392fdd560457a35c8617bf910c7e349bf46bd530b38e72a10
diff --git a/dev-haskell/monadrandom/monadrandom-0.4.1.ebuild b/dev-haskell/monadrandom/monadrandom-0.4.1.ebuild
new file mode 100644
index 000000000000..d5770df09622
--- /dev/null
+++ b/dev-haskell/monadrandom/monadrandom-0.4.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="MonadRandom"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Random-number generation monad"
+HOMEPAGE="http://hackage.haskell.org/package/MonadRandom"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/mutable-containers/Manifest b/dev-haskell/mutable-containers/Manifest
index ad17e1be825c..26990800d653 100644
--- a/dev-haskell/mutable-containers/Manifest
+++ b/dev-haskell/mutable-containers/Manifest
@@ -1 +1,2 @@
 DIST mutable-containers-0.3.0.tar.gz 11959 SHA256 ccec3cc85fa5a4facd65e7ab39220d0b41bd4ec2fe15df0bcd38fcf249105ff7 SHA512 71d2cd276c44c4de9fa533e3a41c95e4c0b7aa05383663f8e9a0cf626a6004ab9927481ba5dca1f5bca06caf54545c0b41e309817b46059a23fc8a30937fa727 WHIRLPOOL 928c79cc1af7269765ba9c0fe7c0810b7162880e1dd6b2934914dd37df116f88dc3a0fe30b4decf10b54f6bfc770826e731c2089ac551514b7d99b84cffe4e50
+DIST mutable-containers-0.3.2.tar.gz 11969 SHA256 781388cf52faa5f9c4c8a825eef11bec430e323c6913d25b5f4e63d8ce02017e SHA512 b75e650406d92de25b903b4a761d760a797d099c7d3fd82a791c1b86caee104081edff159e78022178a284f7ca61233de91c179a435429dd585c46f97c384274 WHIRLPOOL 36d908ca6ea37a1e99dc70c13a4167f65ce960068dfbbfa0b25fe0d6dc8664a6ecbffd78ae88a12cfe04cd631d5eafdb5e01d93c241c685fe531ddc68c42084f
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild
new file mode 100644
index 000000000000..dc29fa8cdf95
--- /dev/null
+++ b/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Abstactions and concrete implementations of mutable containers"
+HOMEPAGE="https://github.com/fpco/mutable-containers"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/mono-traversable:=[profile?]
+	>=dev-haskell/primitive-0.5.2.1:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/nanospec/nanospec-0.2.1.ebuild b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
index 7bd75218e78b..e8fd6ef4e3b1 100644
--- a/dev-haskell/nanospec/nanospec-0.2.1.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
@@ -18,6 +18,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RESTRICT=test # cyclic depend
+
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/network-info/Manifest b/dev-haskell/network-info/Manifest
index 219addac810b..7d60f97db5f9 100644
--- a/dev-haskell/network-info/Manifest
+++ b/dev-haskell/network-info/Manifest
@@ -1,3 +1,4 @@
 DIST network-info-0.2.0.3.tar.gz 5644 SHA256 42e79146828b3e7dfeca884a4be4fe79f7a84bc4471d8cf1ecf7ea3c55a1dc12 SHA512 49aa9c80ef91025f6cb0bcae34afdc7e41f15b56f24b55fe6c622eea3890db9c44bf461819daf961c6b02bd255cadae6eeca22a64398852b21af9f777a06604f WHIRLPOOL ac59e3015155f4bbe640ba6612eb23974fd48d48d7a6cad2f049dc6fea20fdadaa84b66765ec4f00e61c4d1aaadcf61a07990316a6fa17047a9378eb53265113
 DIST network-info-0.2.0.5.tar.gz 5988 SHA256 8ee37b7e3219d18395a3c9020a9be8cfa7c5390f2c4b0e54b5feea35e5b4fd3d SHA512 c4efceb01e5bba02296740f1647e53507e29a6ffa1407a12737ac6828f448992b12f9145aaa7e1ee21d4cdd910a9c7e6bed683d65162696d95ce19f11002b785 WHIRLPOOL 6b96eb91865f550cbeb1964b52dce021d248ae825ba52aa02dcae6453e2aa54edad317943de5ba044e3120ecd108a26e61d1d9a96bee7ad259fe259753d016cf
 DIST network-info-0.2.0.7.tar.gz 6023 SHA256 ef36e2c3d60d120c91d07dfe1081c87b73d0917cee858fba42598f284301405d SHA512 bdbf46c4c814229f51f291b1aaf3909c28ef0903343e836695492d669cd46a2c6baa4ef4f5d29e7b8123fdd18d4285e23a10bb6f4b27c64332b67d7ad82029b3 WHIRLPOOL 78a514c3cc3ad9e90d7dd220cdb44e2d218b0629e5642ce8e3de88b3b29df6219212585fb25b763fee910902698df105fe07d4ffffb6324af9e3fdf29d72348d
+DIST network-info-0.2.0.8.tar.gz 5998 SHA256 ecdff121f3e154c480f363bc8660959a051790bfae5b5fe573810873cedbcd76 SHA512 3b2d23085c8c4cb1cfefc8be75dd7b0c2e144a28b8c203149a246c8b9173d1e3f6b2fdb0e6ac3d13066d0d3b219b12dc82f2e935d3b661ff4dc6d858e376f3be WHIRLPOOL 4a727f3d18ea89bc683892309dc8809c4db3fd41e4abddee238552ef6260209d9596c94e13de7d5708137ec02ca04ffc4746984f649f07245aaca68d4d0fb4c4
diff --git a/dev-haskell/network-info/network-info-0.2.0.8.ebuild b/dev-haskell/network-info/network-info-0.2.0.8.ebuild
new file mode 100644
index 000000000000..465137f64355
--- /dev/null
+++ b/dev-haskell/network-info/network-info-0.2.0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Access the local computer's basic network configuration"
+HOMEPAGE="https://github.com/jystic/network-info"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
index 3da179339a04..c94cfd0c2d94 100644
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
@@ -26,3 +26,8 @@ DEPEND="${RDEPEND}
 
 # it's not quite true, but there was no major releases
 CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
+
+src_prepare() {
+	cabal_chdeps \
+		'base >= 4.2 && < 4.9' 'base >= 4.2'
+}
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
index 67e38c2a9f83..76942146740b 100644
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
@@ -27,3 +27,8 @@ DEPEND="${RDEPEND}
 
 # it's not quite true, but there was no major releases
 CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
+
+src_prepare() {
+	cabal_chdeps \
+		'base       >= 4.7 && < 4.9' 'base       >= 4.7'
+}
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
index ef561ee8f705..bb035d968644 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -18,6 +18,8 @@ SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
+RESTRICT=test # circular depends
+
 RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?]
 	>=dev-haskell/transformers-0.2:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/pango/Manifest b/dev-haskell/pango/Manifest
index c72ec5a11da2..012e88142ae2 100644
--- a/dev-haskell/pango/Manifest
+++ b/dev-haskell/pango/Manifest
@@ -5,3 +5,4 @@ DIST pango-0.12.5.0.tar.gz 60782 SHA256 8f6d75818f2d8230dcb235ba0e2e6c814cceefe3
 DIST pango-0.12.5.3.tar.gz 60968 SHA256 2a1d6f647298270e816275d5f5c42f16fcd12ddf8afc55e3fe2b6309febdc4d8 SHA512 bf93159f10519a0b5c313e0398f4fef703aa97eb4d0c998851be1cb1b7b69b2e28595dbfea2659de89cd2b0df64e1a945a90c22aee503eed2e85482bfa583d45 WHIRLPOOL 0971b7f4422d75f1329d68d9138075ea09de84c4c22c06c65a4d1fabaf531c966dd169e9f73d52cfc44b7afc12cb756b1579464e175dc722beaea9237b08217a
 DIST pango-0.13.0.5.tar.gz 61734 SHA256 7db411d5d021f6bcf17942b338078ce831f2611d59852cae444c9368becb3e0c SHA512 cd937d9216bbdcb8309d2cb0a559a7cef7fe0d11e8fe1a4d95ce5e817b170b013f459c22c127ed59657bc103cc386558d553ab2e739e9a9b98045fa33156ef5e WHIRLPOOL 01319aa57b6406f9b813a86a1720cfed70ea3ee72ec52855937d586c18091a566e2c85ccd344e550647e21f68eaab90dd5f0b3ffbf269363c804a0d7f7058841
 DIST pango-0.13.1.0.tar.gz 61656 SHA256 1612dbe198f8bbbb394bf043eb06c554d5e1c0dc76cdee186ef925fb8a7ac968 SHA512 5e2f4952ee2c6cf7ce4b6c657b02891ea22ec9398ca3e2b82b138e800dca2c0a03a437bcb999ac1093f61a913652e76eb5e487710955865c7c3ea7b2cf68037b WHIRLPOOL b1d7a063d60380693ab3203d6c2eb75dc8a43c7fc516a8a9e13bb1ef6f5591514bb4acf2a2fb6fcc277e05c9348932a1a433eb5d8b106d890e0e94f1a5edd1ea
+DIST pango-0.13.1.1.tar.gz 61730 SHA256 3c22f339fe2e30cb6d6cbc5906e1064c5fdabfbc56d2a2c015ac70b4aa5165ad SHA512 4dd021e03e18bea64b51ad1b4c5cae2cd214f0f26bd41deecf83626f25d70670e2472877e60ff49c30cd0f3e993d8cb4ba7adc3fee26454f8713e2a5bc7a9284 WHIRLPOOL d2ea1ff1c70007d443bdbe2671e93eb3c02fd3a5d6cf115274157150efe61e1db8119f28dd0f149d97eef0f47f75e64c01539b8e15c516fe9f4e3702a960498b
diff --git a/dev-haskell/pango/pango-0.13.1.1.ebuild b/dev-haskell/pango/pango-0.13.1.1.ebuild
new file mode 100644
index 000000000000..dce9ffa1f912
--- /dev/null
+++ b/dev-haskell/pango/pango-0.13.1.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Pango text rendering engine"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
+	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	x11-libs/cairo
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	dev-haskell/gtk2hs-buildtools
+	virtual/pkgconfig
+"
diff --git a/dev-haskell/parallel/Manifest b/dev-haskell/parallel/Manifest
index 5c424c866d5e..bc1c7e8803af 100644
--- a/dev-haskell/parallel/Manifest
+++ b/dev-haskell/parallel/Manifest
@@ -1,3 +1,4 @@
 DIST parallel-1.1.0.1.tar.gz 8074 SHA256 0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f SHA512 edf887f5d7c6b3b0df03405e632367240d5eb7c9cbb157b572f16241418513feac28cea5b9d61249eed87ab37b01591ad682b5d9a9815af6d0b0e00d4c076e99 WHIRLPOOL b8b28ca39e5d9071e84f16d9ed5f55b3c02fda088797330fb46202c7c87957b95e75caffc6909ea9504dacd6cf55cb29d40be3614b4b6919b3908b95dfdb1ad2
 DIST parallel-3.2.0.3.tar.gz 12527 SHA256 163a40ef3c6258c623abe690a9837c9de2bf7fe87d3fac7d0758229d7efb6dcd SHA512 28c0d30d51a6d66379190f96e6c057dde044e2bab25b9e87d6bbad2d43e9f1e6e82c1a11aaa61ce3fbf3681ddcc04f7d48cb6b8c9b611d24e5d95247a0cd0882 WHIRLPOOL f507ab5993d7745b788820f4e7902c557f37139d6939da53e41739778cd7be5ff3a4fccda2a9eaee649f397e20ef5582c4049ad09b3b3d1ccfb2b3799483a37b
 DIST parallel-3.2.0.6.tar.gz 12990 SHA256 b928d3fbd0b7b247bfb7072796c6950f3a5b61ec051449cddf86ebfe89dbe642 SHA512 9dbb34f8cefc06d2eeb5b4d13ca36df74529c98601494cfb6e443f1065d12dedac71123f7cb038d05583df11e502061c74020a88ba2e6bb688041376356265cf WHIRLPOOL cb6f4bdaaba5e614b04f140783ef066c3511a197600e260069f9665bbb22d586d0a17723ba4ef7efc50b5c328a59eb1a525372495401c3b6b03b2872faff2772
+DIST parallel-3.2.1.0.tar.gz 13199 SHA256 4de3cdbb71dfd13cbb70a1dc1d1d5cf34fbe9828e05eb02b3dc658fdc2148526 SHA512 5b5051aa70320a70eb0f2326d49afbcda32f24f9a48463f8854f9d61cca2e61cf321b1f34989d1009f0cc8e49934c820f3d5f89a1d675701d9cf46df65dd2d6d WHIRLPOOL 04b046838d0ea4e8a09908219c07f6d73a45731bc8f083a7c95d89fa4bbb4b7c5ae7411a0fbc6b851b9dc3df81720eaf279b64c733c0601b258e27e3bf93fcb5
diff --git a/dev-haskell/parallel/parallel-3.2.1.0.ebuild b/dev-haskell/parallel/parallel-3.2.1.0.ebuild
new file mode 100644
index 000000000000..2f410f301c2c
--- /dev/null
+++ b/dev-haskell/parallel/parallel-3.2.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parallel programming library"
+HOMEPAGE="http://hackage.haskell.org/package/parallel"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild b/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
new file mode 100644
index 000000000000..d60212fc427e
--- /dev/null
+++ b/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/aslatter/parsec"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'HUnit == 1.2.*' 'HUnit >= 1.2'
+}
diff --git a/dev-haskell/path-pieces/Manifest b/dev-haskell/path-pieces/Manifest
index 03115b541fcf..808fe7b63299 100644
--- a/dev-haskell/path-pieces/Manifest
+++ b/dev-haskell/path-pieces/Manifest
@@ -4,3 +4,4 @@ DIST path-pieces-0.1.3.tar.gz 2478 SHA256 94ec4090356a515d7cec484b41f5730e920d01
 DIST path-pieces-0.1.4.tar.gz 2718 SHA256 5b78f3375dcbac842b7b7bf08e8398255234e8f12ede96c33f75223417b9b0bb SHA512 133d3dfdf2d40f31d4cdb9adbbe5efae5389f97b2b8cd942736f69d25bfae0e84a90431f8027bcc8e9fc6d571e881d3856dec9c87fcb5660773b80de588e4077 WHIRLPOOL aadcc2d2976dc4fdf3963553e91c96c81cc4fb5e40119b297f0f04aebb2286282d421d461394bdf3e0b7dff7a32a8f594b79a503842f37cb1e22d0fd6c90caa3
 DIST path-pieces-0.1.5.tar.gz 3236 SHA256 bca399f1545423a940672106139fce1a8b5208dc9b998b89baa3d6bb1f513e17 SHA512 634a90bc99135192faac44191fc6d40f17795750250cb6088385574eba55717eb40c17b57ba7677e3ce1962d2275a09f3ab7167f465359c152926bee624cd7eb WHIRLPOOL 8e6cfe0e183ad397e71a6da60ae78b30044def35acf643d1573db8fe45cfca7ce8d6e0e6a58fa8d675d52bda953f4e42451e73907f70cc31b41ea4bafab435e4
 DIST path-pieces-0.2.0.tar.gz 3267 SHA256 c097672ab0dd1835b8cadbbd9db412893f02e02eca044c5a1690fbefb3e8df84 SHA512 f0c7021aeea477d820af624f565f9c800844e7387bef8d910d9c1d21339ffb4b6810888b44dd1277c4c7ed1779705db439e21a79fcd88573b0751b28fcf84abd WHIRLPOOL e7899e57618cf0b735a75f1ac422768b345fa281856abffd1fdbee9b505cb376b3ed67d27af6480c49f2cfc70090615cfbc9d4f684812b7950e31020d0e11650
+DIST path-pieces-0.2.1.tar.gz 3529 SHA256 080bd49f53e20597ca3e5962e0c279a3422345f5b088840a30a751cd76d4a36f SHA512 83b8bda16db42ed347e2caa1978f195faf161f53beaaccbf450d21b29b9ae9fc04bcdf8dd17a0db2e11eb9e5bfeddcb605237325c7aaf4ec5cc3402b859674c0 WHIRLPOOL bb0c20c68c49def93bc28c79798210001e11f8de91eebc2c1e9c0bdd0d376dfa4680ad460f7731841946bc4addf33b125428be7ca2150b5e7a1748748214921c
diff --git a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
new file mode 100644
index 000000000000..03939519f0de
--- /dev/null
+++ b/dev-haskell/path-pieces/path-pieces-0.2.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Components of paths"
+HOMEPAGE="http://hackage.haskell.org/package/path-pieces"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/text-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/pcre-light/Manifest b/dev-haskell/pcre-light/Manifest
index 5f2179b55b62..d053b0874d58 100644
--- a/dev-haskell/pcre-light/Manifest
+++ b/dev-haskell/pcre-light/Manifest
@@ -1,3 +1,4 @@
 DIST pcre-light-0.4.0.2.tar.gz 15355 SHA256 ddda356c3dc0075d7fa2740a56845a68360baf896e3e9420ace68c399a21582d SHA512 03bd9cc98bb04452accfe124b674a19e24e1070d3839fc8b9c553ab14f10171315342c191e1b9432a9e8113a4dd5bd845425da597ebe1558bb0dc143edf96017 WHIRLPOOL 48ad5c0f8e8dc2f17ca8bd61bf5027b783f316441b1eb13e55f0a50583b037cf09ce12d8ece048bde85ef5a5b5c4af7d49848fef919ae078aa4252e92abf64d3
 DIST pcre-light-0.4.0.3.tar.gz 16574 SHA256 6e6309fe0f759fe685c8c58a14dd204f7691675b15adbd88208ee332b5702d50 SHA512 0fb9c5b0accec68adb52e7407e48b4ec1ae89f424539a03fe648fa58e501b5fe7b46299c75ac1df0157870e623beddcec018401eee1e5913202e754849146b2b WHIRLPOOL 5ca03f32eefe6b41473d5bc937a0f772cb7754ce5b0a97d5d86c105d0c92022cfd87f82817131f6c2074d1670f17ecb7853f8d5f8bc080051c9412e73cb65870
+DIST pcre-light-0.4.0.4.tar.gz 15065 SHA256 02c97e39263d18fd26aa63d52c88c4bfbb5c3f66ab40564552e7f11d5d889e75 SHA512 ca5f52a8737b2785b4d3eb7c1463233dc579cf10bdb620397f842d4bddafbe636b992f725f85086e5916f2def163d5d25661acd24a358421e2f7f859a2f876f0 WHIRLPOOL 6335f1466b3a6caea7c7bbe671d2825ce80c74d3443bbfe5e8a477612e65738a48ed273ca0c72946a21af6e7602dc5d8a565291c5ae717307195f25f96cc9850
 DIST pcre-light-0.4.tar.gz 28943 SHA256 b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6 SHA512 1cbb37743018e0199d3c23f5cda34a41514ecc375650f2a79935c16b12b4411e5ce1d7fc84b29fbb41458a2493998471cbefc54adbf848d59877c6be4d34b6aa WHIRLPOOL 61cea380f38fd3f67941a4e16a44a02828ca38d62fc896cc5fc34f6e1607192d11e24c66b3091ebfe7f3048f3ae5efd613422716a9d331e8e20204493cb84496
diff --git a/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild b/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
new file mode 100644
index 000000000000..bdc8483d6c2c
--- /dev/null
+++ b/dev-haskell/pcre-light/pcre-light-0.4.0.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
+HOMEPAGE="https://github.com/Daniel-Diaz/pcre-light"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2.0
+	virtual/pkgconfig
+"
diff --git a/dev-haskell/pipes/Manifest b/dev-haskell/pipes/Manifest
index d556bda6ea51..89e98af207e2 100644
--- a/dev-haskell/pipes/Manifest
+++ b/dev-haskell/pipes/Manifest
@@ -1 +1,2 @@
 DIST pipes-4.1.6.tar.gz 38387 SHA256 2d6a5060380497a16287d156c69cbd55d2d3efc6d57d5079f794f90c944e7435 SHA512 a5467658ad9e60b8d2ba39fe4c8fca228388484e9a534e284b51069abc3a7f61382d0cdd6277fa99d5295af06d05496cd2cf4acbdec7cc1556de870d6b0abedd WHIRLPOOL afec914749e101feda0c5d32f405fb3a6e69917048524dfd6e4e22a22e5bd864a016995881774032d2d1d05b1c283da78aa7362be7d1f5d0be53fd45c57a4dc4
+DIST pipes-4.1.7.tar.gz 40008 SHA256 104620e6868cc2c4f84c85416ecfce32d53fbbbecaacc7466a0566f574f9d616 SHA512 95e4a24c156d34ac542a3535f71b60248850b228e96f90452dd6ddb1468f2f9db7a60540536568ac49b6a49d3b43caefa867c42d5e75f010e90b99fadf02827c WHIRLPOOL 80515fd5965fc1ac61c0abe7aec13833aba1bf25bd2834a106cea26da5a234124fb8644e59d352303ea40d2055cfeed4335d852e83fc0b3aba2f5c2a7b429eb4
diff --git a/dev-haskell/pipes/pipes-4.1.7.ebuild b/dev-haskell/pipes/pipes-4.1.7.ebuild
new file mode 100644
index 000000000000..c002647fcdf7
--- /dev/null
+++ b/dev-haskell/pipes/pipes-4.1.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compositional pipelines"
+HOMEPAGE="http://hackage.haskell.org/package/pipes"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
+		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1
+		>=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/prelude-extras/Manifest b/dev-haskell/prelude-extras/Manifest
index 40eda0441ae9..fe2b62efbbc8 100644
--- a/dev-haskell/prelude-extras/Manifest
+++ b/dev-haskell/prelude-extras/Manifest
@@ -1 +1,2 @@
+DIST prelude-extras-0.4.0.2.tar.gz 7202 SHA256 975212ddf8d5b2c5b83347f5d8abef4a2c1ea6e6d9535be33ee478ed6192f5e0 SHA512 f56325aca92e3813a64c118b4865c4f2d36452b6ab3627c3ecccbe7c42919431f6de01b1e354ef12e63f6ca4bc9b1ab0d2bb9d3b2f1df30ed535e2d76064cce2 WHIRLPOOL d4dc01a1ce750bfec1a098402d8237c618655eb4ec18642f8f3485d9fbf887225cc18bb909a19ea24ca87b105584558833cebdc0f5fb7e6cab183149dec5cc23
 DIST prelude-extras-0.4.tar.gz 4958 SHA256 56c9963dc814429451ca66539765c377e932bc5413a637e251aa2af66f62fa57 SHA512 bdf6dc84fa70f21c98767da446fa8744180026a0a2843956012701821599a635a17836a8c815fb663a237fa0487bc0eb845f80f021b446e14a3917dc3e2385f3 WHIRLPOOL b6899f3221478121f17ee591b7b11f93df8bb19eca955b988d75ff3acabbcb57670a810689cf5182bd7a612f6784e37e4cdbe3b559129fae9aeedd0b6ba19ad6
diff --git a/dev-haskell/prelude-extras/prelude-extras-0.4.0.2.ebuild b/dev-haskell/prelude-extras/prelude-extras-0.4.0.2.ebuild
new file mode 100644
index 000000000000..c32b0bbd426d
--- /dev/null
+++ b/dev-haskell/prelude-extras/prelude-extras-0.4.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Higher order versions of Prelude classes"
+HOMEPAGE="https://github.com/ekmett/prelude-extras"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/pretty-show/Manifest b/dev-haskell/pretty-show/Manifest
index 90423ede4edb..1a97da51ca6d 100644
--- a/dev-haskell/pretty-show/Manifest
+++ b/dev-haskell/pretty-show/Manifest
@@ -1 +1,2 @@
 DIST pretty-show-1.6.8.2.tar.gz 133160 SHA256 1bc3bcf3f3aa7de90b156de2dffceb2ca48b7462c84450f42167e13ae5b725e9 SHA512 673b1fe7745e299cd9c547aec90daaf870d13e52c7d78b472a71e5b86e22bcc3cf3ee8a4f0a88826ade20ed59fcbc623254b71485e928fe8f283d28edd7b4a6e WHIRLPOOL 3071317bdf488e8398156728b4a1ebb6fdd02e94362a783cb3976b262b0258b4c40bfcd0aff1ccdc88a8bfbabdf2640caace4c9ab119f5bb3ffef1546fe23284
+DIST pretty-show-1.6.9.tar.gz 126196 SHA256 06bb89709abf23cbf59d50400654cc7a616649f851f9640268b2b5f225a1e477 SHA512 8205182584a03777cb04b83b8ebe2e92bdb17ee801ff9ff2947a860175f7415375ca1fb7b433448b14898addcd0e86bf0f9e0a53a37254322625698bed9952be WHIRLPOOL 56cea0c07bc0eac71f0bcaef10b3ee266522e645d36c30de26a5d4494a9c836600e1f00041621184a36ab5654d5e1791463357004999df8fb74f42624cdd5f14
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild
new file mode 100644
index 000000000000..9811920d3d21
--- /dev/null
+++ b/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
+HOMEPAGE="http://wiki.github.com/yav/pretty-show"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	dev-haskell/happy
+"
diff --git a/dev-haskell/profunctors/Manifest b/dev-haskell/profunctors/Manifest
index 3a3f878a8148..8847eaee2707 100644
--- a/dev-haskell/profunctors/Manifest
+++ b/dev-haskell/profunctors/Manifest
@@ -4,3 +4,4 @@ DIST profunctors-4.0.4.tar.gz 10516 SHA256 1de2857dfc08a2f4533d601edf07ff5de1212
 DIST profunctors-4.3.2.tar.gz 15816 SHA256 9b20c243382bde44df5a96793eaa74eda440ca371563f7a7185543f1e54abb19 SHA512 42fbed0bbe39adfb1092d92559c79224d950ddec03acb2400686d0aee5a2ddd1a978c379202435afce5e9e124bc769a0baa407d4e77e4bea82f5694aa8559e27 WHIRLPOOL 9a6094661c4f504191ae27b4b1177feff488192bbccf3ee35c10b639a0cfefd78388c68da84f48e9fcb62dd00d5bb384b5dd670f2ebc1575f3c6841b1c3264a8
 DIST profunctors-4.4.1.tar.gz 16997 SHA256 85980e45caf1a13b58461614d261febd1c7cdfefabf734b654dd3314d822b8f4 SHA512 66c6a81e2109f7c2f755063b06f54444bd932c679c701880c0ec1a8ee8a50c63b4bab67f7341af745c0a77e362ff74de9da8116e2641d5f99dd59250657b7f50 WHIRLPOOL b32b0decab5f1217ef5f0280d1bc1a8fca754fc4f6a2fa385c8f487f674582679cbbde15f1f52d24eede97e3073861b35590ff8a526a31bc3ac1c803a11078a4
 DIST profunctors-5.1.1.tar.gz 17866 SHA256 873f4478cdadd574c070c00fa790e4b0d8fb6f00577f142bf6e9dacbd48d8253 SHA512 c06266576e123ac1671893cc732a0a176f9132f2cde3be8a1b55efe73e272a326ea605bd7d9396e79e3bd48bfb66c721dd6c84fa7bc4fed53b1d788aebc7b5a9 WHIRLPOOL 594bce24d17f3eb9d621696c54eae9ec1cecb752624cf2fa8f8f3197bc42d77cb74ea43787d0c80e9650a6800d25bc75948bd3ec6c5d23a28274bd9ee42b19a7
+DIST profunctors-5.1.2.tar.gz 18845 SHA256 e0cc9129a4c1d2027cdada0a4cd26e540666a929ebe4e17ce5e2cec02d589682 SHA512 420c3c7beeb17ec42354fd805045bbcd26d406cf4b37a5f70f1f2fd5185f309b97138008959b5a028ff79144562316221c1605917a1d784315d618c1d61b37a2 WHIRLPOOL 2a9b9c2a9afff32d85fbbf87155423ed8eadbd8453f5eb620ce3a63f062da38f646e3acbe279369c1ca2af59ff22e9d8abf1e99f59156429b2c089cb4c9836b4
diff --git a/dev-haskell/profunctors/profunctors-5.1.2.ebuild b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
new file mode 100644
index 000000000000..82d231966228
--- /dev/null
+++ b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Profunctors"
+HOMEPAGE="https://github.com/ekmett/profunctors/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/quickcheck-io/Manifest b/dev-haskell/quickcheck-io/Manifest
index c8e838e9b338..52a3500f2d2b 100644
--- a/dev-haskell/quickcheck-io/Manifest
+++ b/dev-haskell/quickcheck-io/Manifest
@@ -1,2 +1,3 @@
 DIST quickcheck-io-0.1.0.tar.gz 1604 SHA256 5a32c4bf8266010db2874d101b6af471af2e41d602c34ebd768c867bd8d1ed98 SHA512 9d0ed38c0e90475946528373e0ccfa1cd66337fda6ec18de1cdcfa7469e9809dbc227f8c8b0c2a48b020749f1750f1159f6b5a24a2b5f1f39965561bfa7c1d60 WHIRLPOOL 769617053dbd549222a9e9c09894d8718aaef664f3e7c415b42f385781c5dbdaae9df35ff965b92663212c44cf4375d22374af9ec41a2fdb5ac04d259b1207f1
 DIST quickcheck-io-0.1.1.tar.gz 1646 SHA256 a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b SHA512 440e15d8600f7b0f662cacf176dfb1c00371add4204fad3ffcf56e092d92b3405a2e5a0a6e03b265c83dbc2ff18f3f47213e8086164840d5c8da35b575ebb007 WHIRLPOOL b874d816a5166421b13e5721bee11b7a06d01cbbd6458a71b7f595fc0974cfdc1e55e0bc938ad2088a4a02bee95f6baa60e85d8250867385db324d741365f5b7
+DIST quickcheck-io-0.1.2.tar.gz 1784 SHA256 50275e5253dcf0c838e340fa19eb841804deb634aeedbf33f0b46a97b89bc1cd SHA512 3a3f1ff1bb8fc4924396cc6ba7dc827f41f2d7186707c78325eca3fea5bafa0257cad4d69debae0d7847c10dff88281fa3c9bd63e1882a1fad7c1f3448132835 WHIRLPOOL 760c80face3d603e8c2e69a81e3b54b1ef04acb39c887f1b55c611f1451f8f9eb5abd63de5d8d03b65aece017b3ccf5103bc2b9f5c9231794be1ed8528fd7528
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild
new file mode 100644
index 000000000000..04ba15ac81e8
--- /dev/null
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Use HUnit assertions as QuickCheck properties"
+HOMEPAGE="https://github.com/hspec/quickcheck-io#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
+	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index 618f27fa9c17..6a58ce04ed57 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -2,3 +2,4 @@ DIST QuickCheck-1.2.0.1.tar.gz 8874 SHA256 8daee0117004a5c8962092a1eadfafc31f86d
 DIST QuickCheck-2.6.tar.gz 26466 SHA256 8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d SHA512 17cfa7b9ee2fa3e31b48ed3609d5e3bb2316b99251e45e56d377a198d8cb429696e25ecb35ef1bf5cac7e313381274c646393697604f1feefe225fc692e01166 WHIRLPOOL dee9d3b80cd3f38bf479eeef4b861bfcdbc1a8bfefb082c0613f3d9589000c587596bc710ce3b3ab0e8e5f38ef9b9b087f7f60c2b9eb499195c9888088194d83
 DIST QuickCheck-2.7.6.tar.gz 34513 SHA256 80d8970a0c1dfcb714215cf11f2bf0f79339f70c01999dae2c31516100a0c527 SHA512 21e17fbe6dfc2425a948c789ac7d519cfb21c48df68b63de68e6af192d9642d24e1e46ba0b356767e2a10461a3032a4742a6608248574ae458fd2f03649f0451 WHIRLPOOL fefe84afe8c4a41935402de6df219faf1ae8144016df763d8efb66fa8c88a65a5a66d02e6be8cd09709d12875dcedf16c3a4b8906c8ea51de2160b6859ba0760
 DIST QuickCheck-2.8.1.tar.gz 38999 SHA256 7073aa3635660476aa31df7cf0476926a1ac0231235020122eb276070675763b SHA512 def1f7141b80be5b508e396c069f6f270c9b890b0ce03df41e058092e6dad28ed8c838734814066307777e6b8b93f154d1b0bf9b4a7052318ec018ef0901c1ef WHIRLPOOL f7b8fb632fd9b304cabf71d679174b391866a0cab0d7cebf5204723734468fcaad721223036209cec653b948f7cdb450fed3ac1c5b0d121bdb04a9d51c30f5c9
+DIST QuickCheck-2.8.2.tar.gz 39725 SHA256 98c64de1e2dbf801c54dcdcb8ddc33b3569e0da38b39d711ee6ac505769926aa SHA512 661b9e5285f56f69f8807ad0679ca4e18d0ac648233d5f6cbcfda548fcfcf3bc1b790c409f66fdf67cc4a3b769a248b43b0cd1abd103ae6d9a596978c5af4aba WHIRLPOOL b11397ed3666b5f80fd1d7d25dc8af68d3d4d535c7505516885dc90450c1e2e1884b5389387d63cbec1c862d3ce5f20fd038aba8bdf2e61f05d697cd13bde240
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
new file mode 100644
index 000000000000..1fbf27708150
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.8.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
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +base4,-base3,templatehaskell:template_haskell
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="QuickCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="https://github.com/nick8325/quickcheck"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="+template_haskell"
+
+RESTRICT=test # to avoid test circular depends
+
+RDEPEND="dev-haskell/random:=[profile?]
+	>=dev-haskell/tf-random-0.4:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-base3 \
+		--flag=base4 \
+		$(cabal_flag template_haskell templatehaskell)
+}
diff --git a/dev-haskell/regex-applicative/Manifest b/dev-haskell/regex-applicative/Manifest
index 8f35b4785a21..bc69bdf8a799 100644
--- a/dev-haskell/regex-applicative/Manifest
+++ b/dev-haskell/regex-applicative/Manifest
@@ -1,2 +1,3 @@
 DIST regex-applicative-0.3.1.tar.gz 12627 SHA256 1eb8d5b2fb20f2d30180e0d1a2bbe1aba9890864e2bac3907bf6ba1f408895ce SHA512 2b61679aa3bdee09810a872e75583bf8b050d00050b8a1a5fe226337cdcae2d1a1ca31139d4006f442b4d8c3a78206dbff7c1bfbd480beec7d30b4ea9aeacf8c WHIRLPOOL 3e08105ef4691cf78049327ef6c799f0ce260ef7531fb92082d642056cf6dfbf69276ddc756e1e89079f84f01ca89c443adcd41b8bf4bfd51e082b6ce16603d1
 DIST regex-applicative-0.3.2.1.tar.gz 13531 SHA256 bf4ab2dc765d8083ac08a72b2221712a942a734b90e4ce433baf4b5c8db35ca7 SHA512 03f83bf514952055ef27edc6d04c7969a085ca9fe458117c401cfdd83fd7e12c6969a90199d094f20a4bbabeb8055a70043b08b2149c92b477ceecd5cc80ed1d WHIRLPOOL 828a57b06acbaa630ec7091b9bb90840c5ee6d96b092896a7ed30de0cd755feaa8eea6abc05b233f2ed2239c1fad084a1fc8e36e13230451dfd18a7a6bd37e07
+DIST regex-applicative-0.3.3.tar.gz 13834 SHA256 6659a2cc1c8137d77ef57f75027723b075d473354d935233d98b1ae1b03c3be6 SHA512 02358efaa912efd232654a404ef5f7cf825b8852bf2c59fd59122047044fcab5ae28bf26de6818b337d917c594fbe165eec917d88b02723e0b181fe2b57ffbe8 WHIRLPOOL d5986f82d158be2cb497df7008d666baeac5da8eecef6c8b5a0428dea373ba71251db04f392b73102d37027412dfc85cdab5dae6afaf594d9b3f5cd8f749c09c
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
new file mode 100644
index 000000000000..404f8120d9f5
--- /dev/null
+++ b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Regex-based parsing with applicative interface"
+HOMEPAGE="https://github.com/feuerbach/regex-applicative"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/smallcheck-1.0
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-smallcheck )
+"
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index 036ad71b6ec8..ad685583d71f 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,2 +1,3 @@
 DIST regex-tdfa-1.1.8.tar.gz 65948 SHA256 7d9ca2ff95e602c46090dfa56f3176fe903d8d08ac9d725c79af56be0aece5d4 SHA512 b88d620cc29309fa43252a6cbe5dfae8bd5dd4503669e56869a38a3b5da9913548b768b64741a8bb7c3668c725540209d10c2d6c0ab33abc480639077b3e7b73 WHIRLPOOL 7829a07236ebdf7956742cdf55605be3ddfd14d9624b47393416b969717e02b5fbb6218e3d8c882a7d7403bd520c0815962725f828490cab73e108a5423a3435
 DIST regex-tdfa-1.2.0.tar.gz 66039 SHA256 fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401 SHA512 d4419c5d5062dbe63ec5931bd9f11020b3aa3227abdb66cac0732417e34cac9a3a9d564bba8114a77570e3b1bacce404062ab04536dafe10b764886af8e491c9 WHIRLPOOL 345e19f9a3c71e488fdf3b891b216ade1b0ec8311d255e67284594a8d2480e308f54260f6bf57c8750b81f9e8ae996f3ddaa4d57032f2fd9343e057d98bb9b97
+DIST regex-tdfa-1.2.1.tar.gz 66108 SHA256 a38d305eeb78be2e34542b423e6a4763fbb8ad1df757aed01993785858c871a7 SHA512 04d3c7235c126695ceaaef0bbd5e6ee6ebffe7c4fb96b9f5a3df28bebe02a680cda870f228bd2e0e30ed98f88eeed4b4d4cdf6dc5ccd0b8e45c8427b6d7fa85d WHIRLPOOL 082546e844173743b40e9a06fc9b3497dd45b70add08f56680f6ea2f42cab9e14225f90aad96d03a17c7d943c2d26a9e776fe5fcca590f948ff8ef1b2d54804f
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild
new file mode 100644
index 000000000000..b27628100067
--- /dev/null
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="http://hackage.haskell.org/package/regex-tdfa"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/regex-base-0.93.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2.3
+"
+
+src_prepare() {
+	# too much load on compiler (~2GB RAM against ~500)
+	cabal_chdeps \
+		'-O2 ' ' '
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
index 1f2c94340a45..38bec595d55b 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -7,3 +7,4 @@ DIST resourcet-1.1.3.1.tar.gz 11218 SHA256 1d65d4fcb9a059e79868c40f91f4abe3c2556
 DIST resourcet-1.1.3.3.tar.gz 11332 SHA256 829f2a7427429dbfd343e03c5bfb3e46c3bfbe84a797e9c166d40f0b66b80546 SHA512 f1d60cb510bf751d86ec5ed5977e96e3ab1de2ce31ec24efe4619a5b16d757cfd004cd4f04ebac876cdc9be8139c78681346e7a5bd403f09131ba5f315386bcb WHIRLPOOL 907323fe9710d14cc0fbc053a851d67855b6b88574464d39bc02a02934a486930f016651bce1b33c3624f998046b5a326cb28646168511a872998eeb586993bc
 DIST resourcet-1.1.4.1.tar.gz 11417 SHA256 e29afb420e2f5b8d82d1a4c7a722628e1d8d2f96bc3282b20b0a3d21b25c89e3 SHA512 f15d1c2b25684fc049f84a2590cceec64b3d7db942ac155b6d5ee09265d521a1008de2af257fb7e99b09932038a0eb1cc8bfe1b62dc85ec581d2145b2889450d WHIRLPOOL 904bab36c57e5664f0f2617e700134162c187b9b8cec8b6f2dcb1c12f49e2139fbcf7b39bd0febeeaad1acbb069afd46d0e7ae1eb24ce5cbf427c29c5adf0c72
 DIST resourcet-1.1.6.tar.gz 11627 SHA256 3e10ea62fd97334a5fd6aa3410e6cf50d46b914aa1c028b7393e234b94521a7e SHA512 b35290187870db8da1b4041d159b0ee677bd4532fcea44d7dba7a24746e04ad53f6047fde4ea8de7d61bee8125a8cc6f50d10a43ba1d0e1d4b54e1bc5ad1a7ef WHIRLPOOL 6fc4a572e4bb3c5a9beb07a75ad9623764669c4cc420774cdeb8488cdfa8a51a13ab4543a6791a4605e354bb0666244629598fb180b9a1fc552b7b1ed02cc755
+DIST resourcet-1.1.7.tar.gz 11627 SHA256 3b79d07199160c966c67a5300a51b7c8790dda7bed6c00e554a0062d03c9ab4d SHA512 27a348354fddfa348882217cb7a66987d843c87658c53f7d173276731e11cfc3438312028d4c35f7821db087a30227979a6d1018bc7e4ca516145c4f2a91a231 WHIRLPOOL 4f04bcea75914a5eca361c3b865be31817cae2411b81717de172add419dd4e61409bc03ea8dc7e92e85c33704a40f9677df46965833014d706c28b3b31026646
diff --git a/dev-haskell/resourcet/resourcet-1.1.7.ebuild b/dev-haskell/resourcet/resourcet-1.1.7.ebuild
new file mode 100644
index 000000000000..3f67b3e2d1af
--- /dev/null
+++ b/dev-haskell/resourcet/resourcet-1.1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deterministic allocation and freeing of scarce resources"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	dev-haskell/mmorph:=[profile?]
+	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3 )
+"
diff --git a/dev-haskell/sandi/Manifest b/dev-haskell/sandi/Manifest
index bbc45c89ce2c..a914c9fc5195 100644
--- a/dev-haskell/sandi/Manifest
+++ b/dev-haskell/sandi/Manifest
@@ -1 +1,2 @@
 DIST sandi-0.3.5.tar.gz 18700 SHA256 856ed995bad4183a69f65c70a78c4be37cf614c906097ea126bae75ce08daea5 SHA512 0ba8f1cbb10097283a58a133c3e119335efd326f9a27a9178b424c5d0fac31a28dcd2167b17a7d8a934f638a1d98c41f4592184124387c37e37961db43f3b020 WHIRLPOOL e953262ea2e4a0d0074bb420a7a57804ec7e194b17205c3f07121171df98459fec0d6ff0a95b959c61b4981febdf54002231ad42a6b4cea6ff593cf675558c6f
+DIST sandi-0.3.6.tar.gz 18463 SHA256 fafcb3501b8a17238de44239ef62c3051f9a33010424ef91dd76057257bf2284 SHA512 8a730f63e72fb648e2ae478a3785ab364b437a319735acda80558639cc0a43027639ff01dd2b630277348ebc31a4a5fe30ede8f4208229c1c8810f78d350bbf2 WHIRLPOOL 3eb72f69eb0e72380b91c5e12353bb1c00e6572c151a5e40a770c1b51278ed4ab27b89136f04db9b4a7b48bf9da69fa4356f800e1fa45061eaf9da36c688dad5
diff --git a/dev-haskell/sandi/sandi-0.3.6.ebuild b/dev-haskell/sandi/sandi-0.3.6.ebuild
new file mode 100644
index 000000000000..c1c26058a660
--- /dev/null
+++ b/dev-haskell/sandi/sandi-0.3.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Data encoding library"
+HOMEPAGE="http://hackage.haskell.org/package/sandi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+with-conduit"
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+	with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+			>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+		dev-haskell/tasty-th )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag with-conduit with-conduit)
+}
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 8201367ea318..8b5d9a27ec9d 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -4,3 +4,4 @@ DIST scientific-0.3.3.0.tar.gz 17182 SHA256 3bab5bc2df22feac6b2e461daf3ececae2e5
 DIST scientific-0.3.3.3.tar.gz 17674 SHA256 16c31a8af69ff527b99fb395df0e62df6f213d60ad55f23541ecbd195a9dcfc2 SHA512 c779ca32e351b3ce7793eab1c941722be1866f4786f995dc7accab052ca6791d1eece0881c614719744a53c4e2e84512ced59cd6204e85a82879decad4696791 WHIRLPOOL 462b629113bd53a9239548f3d18b2779a56e2876eb47b7e8cd7374b307590417a5316bb1c18940ef1e72bbd7cd4ab938380f2ae42c617da131170b9319eeda3f
 DIST scientific-0.3.3.7.tar.gz 18532 SHA256 c00b82c128d3b9fe350b2018674c5ac4483b91dc18bb6a807de42926b6322799 SHA512 d4277e9c20213a24a2dd9504d7e1a5bce342277b6c33c6ac46ea911758f4301412cb1568a3de962eaf9ba3e5536e729ad1243522a71b92d6b09b0d5c1d25c1bf WHIRLPOOL fe93c66629ea3cbc0df106c3ff37b3cdd41e421426122fb094411de1d1b5bd5b9f043c2c380064e3ae7d6fab98fe351b99f553582f81001ab0bdecdf61169f89
 DIST scientific-0.3.3.8.tar.gz 18543 SHA256 e30cde2a44a7beded15afd56606c562b76e457835e7de2942815f22bc74bce4c SHA512 ef77aa3490cbbc92ab71c1db7015ead24100a6230444b895c49bc4840a80dad04f4f8ff0c1bff27490f5c35b53a1f0c294177912492d1259e204bd4d874ea477 WHIRLPOOL ff642411c9edee07fee9f632d9571ed884e93e4e93b4ee15fa557511c6513b50f113f9cb6da3d5ad798e812a4da82c11eb7f63ac24a742009dc3864333ebdc7d
+DIST scientific-0.3.4.4.tar.gz 21646 SHA256 f7c81e6ce6bf1161033ad4bc47b5bf164f4404d9df686dd0edadd488db25a519 SHA512 18c36036ffe15ef4203d391864c91d505a4a55c7da1b71556cbd6ebb7f83e71e0695789f8beaa4741ae4e21ae54bc1f795a26cd4e3208d08625d639519945217 WHIRLPOOL 5748d37e27ec69eff8ccc1e9b0d07f9f98568644de909dd1d7671d8719949edcb52b823ac0a89292d2cda05efc23809a3cb3ffa6ef2a6da8f049edc69f5eb959
diff --git a/dev-haskell/scientific/scientific-0.3.4.4.ebuild b/dev-haskell/scientific/scientific-0.3.4.4.ebuild
new file mode 100644
index 000000000000..b70a0a22aadd
--- /dev/null
+++ b/dev-haskell/scientific/scientific-0.3.4.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Numbers represented using scientific notation"
+HOMEPAGE="https://github.com/basvandijk/scientific"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bytestring-builder"
+
+RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
+		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
+		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
+		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
+		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bytestring-builder bytestring-builder)
+}
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index 8a2763b9dbb1..0bc26962dfea 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -4,3 +4,4 @@ DIST semigroupoids-4.0.tar.gz 15824 SHA256 9414d79047eb95b26b13ad0cf541b494a51e1
 DIST semigroupoids-4.2.tar.gz 16395 SHA256 88a95d383195307f4e9e20d49f194a192d816bf15fc2f12a63820a8742b9f1a3 SHA512 6de5f5d62215789c4ef2c5c20390991e5aa9c6106685daadfcc36f09b91483790d95458344f208e8582430fcaf1fba2f2531743e9a6f7353cec2024adafe10a9 WHIRLPOOL 1da05876d3072bc767f28393437091a9df55caadf9804877546c8988cb604d161a1f1d47bbd198cf73d299c587b5c98c5e5f938c264f2ea7d54650bbe691ac13
 DIST semigroupoids-4.3.tar.gz 17190 SHA256 4ea30261a070a6af8dce041041cdb8af67154dbab95f329c9953ffc09ccbc0e2 SHA512 2c914071401e26f4c3aa312aab4dd6f5f3d232e0d3368b3c0dbef867bbc2fe1e75d574831994cb6d2b8dbf797b54b9b6573ed3a54392b300bb119779a0c5a961 WHIRLPOOL bd9fb22ffb4738f753e051acc168ee02c155603bf08f08a7116108545c1003a9bcac50820abdf19b82bb3f3bafc520c051c18878f832648a429c235b2ca0b146
 DIST semigroupoids-5.0.0.2.tar.gz 20667 SHA256 5c978f9a75f837287690229afd24a0caf10ec3bf277669a4419010fc08120793 SHA512 dfe6960251aa83d9e0e739f8a5f9a004a04719d65e43931d31b4a785faf3cb19af97fad6e1758f3efa238ac434c3676a8ca986a3769d98be6d74282026810ce8 WHIRLPOOL 5b690c65199f5e9756110f4a249c5d3809d1ad73e989bc1a72723264cfd695461be00707e6ac3e337e3f138503d9d6811965a03b627089954d2f7f5c755ba43c
+DIST semigroupoids-5.0.0.4.tar.gz 20795 SHA256 cde047e36c4072dd32fcda5846155a3dd4e844f441e4c651b886ee069d95c7c9 SHA512 f1d394a4a6b3f45f9d6cbd338245aa1b70162a91285900986376003799ab67e473a46339e986832ee40de525ef82f54a4766e1b29997425d94a42553e67e43fb WHIRLPOOL 5a8ee398a49169f3f07d4a1b00f9f10fad3379bd71031904900769bb2020f9106a6b6bcd8940a06a5a851a745cfeeb1cbf7418886c7eee26e94f2ff4e6957267
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
new file mode 100644
index 000000000000..90670412fcc6
--- /dev/null
+++ b/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +doctests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroupoids: Category sans id"
+HOMEPAGE="https://github.com/ekmett/semigroupoids"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+comonad +containers +contravariant +distributive +tagged"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-5:=[profile?] )
+	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
+	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag comonad comonad) \
+		$(cabal_flag containers containers) \
+		$(cabal_flag contravariant contravariant) \
+		$(cabal_flag distributive distributive) \
+		--flag=doctests \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
index 550b45b280d2..47b3ccff8b2f 100644
--- a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
+++ b/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
@@ -23,3 +23,8 @@ RDEPEND=">=dev-lang/ghc-7.6.1:=
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
 "
+
+src_prepare() {
+	cabal_chdeps \
+		'base >=4.6 && <4.9' 'base >=4.6'
+}
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index c3341f794306..558d0765aeaf 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -6,3 +6,4 @@ DIST shakespeare-2.0.1.tar.gz 58652 SHA256 47e8966f6ff7dcdfff33ba095806f743e6319
 DIST shakespeare-2.0.2.1.tar.gz 60278 SHA256 ea430c50871296a7a1b37af6023f6c5345a7063ece748701e5e339c626b5e3e8 SHA512 a030f30726580359b70e25eca5c783128e3ac0e14f6d08f2d3c4f09d949cfd4548fc1f58f8a20661875a8cc21c1359e6acad3d3011fc45367183cde046a3c67c WHIRLPOOL 3f8b83ad935a8e31c7a4d6ef840238ffc9e45ee6f4906aab0f5212407c847f2f73d311d611dc08322b1f0e2d3d16f53f1edb41a6116da94521b84a4d7c091fb0
 DIST shakespeare-2.0.4.1.tar.gz 61151 SHA256 f1e3845a43616c26347c7120fa434e482ab108dbcec9123258d94e3947e06a7c SHA512 0b7520a1f8122cfb7d7ce998916e1bb317080673ac705da1064480b88fbb0acdcbd458569d808a34eb86590d6388e68c642eabcac7e8dd7e8e54d9e66691f711 WHIRLPOOL a0a7521afc6af38f787a0269013929911b4f4196b902a2de86691cd1dc83965c59beae9546c50414922ee614d37942d25c40a0f8a6369ffa0f0f5c01dc615bc7
 DIST shakespeare-2.0.5.tar.gz 61636 SHA256 f0ff00f9262f874512ce7624c45c0e9f6e90dd1c4bf9e81891f7e34f5faeb549 SHA512 c0118826d9f529c444dfa9077f8cb79fe1630b24d50dca7ba59287998008ec5e8e0197a76fad68569a7451bb4c0e802d373364c840470ad45cd968d1bc157d20 WHIRLPOOL 3d38d4ddf0daee4b0dd3823ce665826596c0356bf7c2965570b4457a5263ff0ffc29f365d7dcf094c9bd10130e763bdc3ed8899a011ad0f837d110fdbafe0471
+DIST shakespeare-2.0.7.tar.gz 62913 SHA256 7a567d6effb68c7b39903fb1fccee54e6a1222a4746b5135da5623c406281668 SHA512 5d682c2a4c36b7c8b5c8b87a3d0e509eb84e9e0a0e00a691cb9687c6f335c9ad895b81115a4e6fe8f4087ac6febe3e3e26d39ec305267228b1c9f295f9cf6d16 WHIRLPOOL 4845eac56c98af732c02ded2b1a4f2d2d4224f2470e2e4a534d5799335034c09d6841e324960ff53f44f4b189e68a8a0dd2928703f4c30f6765d7ec668956ead
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
new file mode 100644
index 000000000000..674e23ffb12d
--- /dev/null
+++ b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A toolkit for making compile-time interpolated templates"
+HOMEPAGE="http://www.yesodweb.com/book/shakespearean-templates"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test_coffee test_export test_roy"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/blaze-html:=[profile?]
+	dev-haskell/blaze-markup:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag test_coffee test_coffee) \
+		$(cabal_flag test_export test_export) \
+		$(cabal_flag test_roy test_roy)
+}
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index fa6d62ef8978..ae68f93e5fa6 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -3,3 +3,4 @@ DIST shelly-1.5.6.tar.gz 28264 SHA256 f45f778d21661f616cfc849f7729e5aecef7250687
 DIST shelly-1.6.1.2.tar.gz 28474 SHA256 719a60b951654365574cc5af5f5499acd4fb8b3e0c573d48572c2f6ce8f56047 SHA512 7ea7b2beab5ce59c3c0aa1794ab4aa1d3ad1823908a310d06eabf2e168579741ac46ce0ac4c7b5c65274f705a09ecd8c8d93fd7fe032d0ab53c0a466165611fb WHIRLPOOL 1abec6ac4d561cfa68ea070160e027593a3ccd63d2c6dc43e19708b34c9492df7f2cee04f79e63820c96d185cf2c574ccdc58369fb048bd4485e617923f33855
 DIST shelly-1.6.3.2.tar.gz 69955 SHA256 c51912d7cc410709046bfbc1cd0a8d3feca35fd72954906757bae63c88854628 SHA512 08bbfbb93a54d663575fac7d344ae438662d663525b945eb32b675b97a5ed79eddce416e0fb10130be8fdbc1b82c62b57aed5aa008c0a7f05fe97966ee3ddc77 WHIRLPOOL 9197af1ccecbdab2ba97df05b6ac0e1661f8697a402e79cff82cc4cb9f815eb49f2f836efa4308c5efaa10867efe4e92ec8b5b4ba31ca7fafc9772a2bc6bf003
 DIST shelly-1.6.3.3.tar.gz 70187 SHA256 1a6624db16198b7af4d06d2b79f46346c1c459bcccbdf2958533b396dcf56a9c SHA512 79b7425faa78ff359eeedd7f73a1d8a22f986a729901b128e82af51275f791d1945d28df8c96e5663523290c59f1a9b8799b3362321e1da21ea69556d74747f3 WHIRLPOOL 2d23ffb24447effefff2ed5fe0f4008bab542b3efe0e00e277c06d28cd3d0d5beb5f1bee9cae6b8591a12ca593ecd45f967b7b9f07b16fc9060acfadcf5a70d0
+DIST shelly-1.6.5.tar.gz 97274 SHA256 bdfd09b01f3de8e7e58e98591ab1a42ad5a74308ff29f19acd16d7cc85b71cdc SHA512 6a5b418987392d755e7faf60206a3e9283e98f56a4d9d9f956c0385074ff8909fb6bddceb050b00dbd0f8eda55eeb4897d9afd2f8dd2d510367567336a7a6770 WHIRLPOOL 127f28061a33f979a884b1e110bcb4aabc10e7cf6eae9953e0fbce0bb842e8022574955c7a8ff4a5d411ee088aedcf76c08eff768aa743f6e56f22da0f4606f2
diff --git a/dev-haskell/shelly/shelly-1.6.5.ebuild b/dev-haskell/shelly/shelly-1.6.5.ebuild
new file mode 100644
index 000000000000..388277448359
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.6.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="shell-like (systems) programming in Haskell"
+HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="lifted"
+
+RDEPEND="dev-haskell/async:=[profile?]
+	dev-haskell/enclosed-exceptions:=[profile?]
+	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
+	dev-haskell/lifted-async:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?]
+	<dev-haskell/system-fileio-0.4:=[profile?]
+	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	<dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.5
+		>=dev-haskell/hunit-1.2
+		>=dev-haskell/text-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag lifted lifted)
+}
diff --git a/dev-haskell/skein/Manifest b/dev-haskell/skein/Manifest
index 0080f26eb261..fca552d845ba 100644
--- a/dev-haskell/skein/Manifest
+++ b/dev-haskell/skein/Manifest
@@ -1,2 +1,3 @@
 DIST skein-1.0.9.2.tar.gz 119484 SHA256 fc85e895caf22fc70f12982132a1ef663790c578226cb230693be5222a860bc9 SHA512 dc92781a9deca938e635c6027cdab0c113b5c657e0af7ceaeb50d81301e17e446ec87a1eef6599e610f8a63062504eff653d50cc48c5f8459af6d8b1abd5e057 WHIRLPOOL 0b57048d238cfefcbdc7dadabae19a31de0b6d5189bbc46d69c18d1eb539c244398c7fd0871719d1a43d8e641b74735b5b9b7d07a07b60256bf44a57d68e4155
 DIST skein-1.0.9.3.tar.gz 119484 SHA256 c7bab12dbad3af29fd8d3b10f418198fe22315e8f849539bf9d7efe9495df14c SHA512 af315f08b8639bad4d005d1d1c19fccbd3ba84d1994d5b904d342e8df20de072542e4abff4476c8716d7c29d31aa0c992ff91096f9b475fdf897d35fc5037283 WHIRLPOOL 1d00a83976a0688474632b0d7ffda35956d34cf9290599a4af1e6abd7199578f05e66982ac6ad11ede254a518686a45328150bf0fa9a9964fa9141601bdf23b2
+DIST skein-1.0.9.4.tar.gz 134346 SHA256 f882ca0cc5ed336ef898fb3c89579e392900259296b2320edf968b9fc16cb8c9 SHA512 4f449de2db0c9f6a22e3f7375999029c1ab9139ae2e678e5582d5ad05dc8b3c12c99951ede884228579b9acc0243b00b93dca07dd6d1ea314cc0d3d223165c34 WHIRLPOOL 82da46072c1f84ed7ae3e3fbcbdc9b8d659d53113750ebf30ce3fbc93242850ff1025361e96fc7d7bc0bb016130be373537bcffd541ed2980a6b5571b51ee409
diff --git a/dev-haskell/skein/skein-1.0.9.4.ebuild b/dev-haskell/skein/skein-1.0.9.4.ebuild
new file mode 100644
index 000000000000..b63feaa05e1c
--- /dev/null
+++ b/dev-haskell/skein/skein-1.0.9.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Skein, a family of cryptographic hash functions.  Includes Skein-MAC as well"
+HOMEPAGE="https://github.com/meteficha/skein"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="big-endian force-endianness reference"
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
+	>=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag big-endian big-endian) \
+		$(cabal_flag force-endianness force-endianness) \
+		$(cabal_flag reference reference)
+}
diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
index 1952e064d5b8..38185bfabd88 100644
--- a/dev-haskell/snap-core/Manifest
+++ b/dev-haskell/snap-core/Manifest
@@ -1 +1,2 @@
 DIST snap-core-0.9.7.2.tar.gz 91604 SHA256 526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651 SHA512 b07e69a636d148d7f9ce107fd056e92aef8de7dcb7a422e6f4fa69db84abf46caae635bca9b5d6d7e25f597449b9f6dcb082b3c01119c7c56f5c296950bad21b WHIRLPOOL 36ee6a2d118218b839b7c45514423ca09a1923be31e62d0fb2c0e16a2ece6429da2b71b3629c08161c487f63d2737e98d517f904795c7524ee5a4fc6cc73038f
+DIST snap-core-0.9.8.0.tar.gz 91610 SHA256 47310fcd9c347883f5985c27c1fbcfac8c5783472a01afcc720bcc850622d2db SHA512 8bf98590294b3f8752255612b90378f19cec14067f2eaddab496cee5fddb4b8be954aada5a7831b81611d7ffc04d74156eb8fdb5d3c5f45e30259c7f86605585 WHIRLPOOL eb7de86ea6771811f310baf6b915fb387b2e4a00a86d3c4dd58e97e504688b435d42ccffb80e357d3d7a2065958998f628b50db139968f2944502ba1f3d8de0a
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
new file mode 100644
index 000000000000..cb4661a2f407
--- /dev/null
+++ b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
+HOMEPAGE="http://snapframework.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug portable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
+	>=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
+	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	|| ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] )
+		( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
+	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
+	!portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?]
+			>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug) \
+		$(cabal_flag portable portable)
+}
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
index dee3dad67b02..1acc38df67b2 100644
--- a/dev-haskell/split/Manifest
+++ b/dev-haskell/split/Manifest
@@ -3,3 +3,4 @@ DIST split-0.1.4.3.tar.gz 12882 SHA256 7e69989206e26bb28f46cc8cf1edff5e439aa6be4
 DIST split-0.2.1.1.tar.gz 14046 SHA256 bf36c149a6613fc6be78ec170ae98a696aae887b82434a1439da10e47823f7ff SHA512 f3d8623c7c16871683f175e937e3cfa236d6f8bfe7ae1c082c0c21b8d1562ca680ed17b78b4a568ce74126077653d978dffbb66ca1cd06e222a556ba2e2559e2 WHIRLPOOL dcd8bf3e824962037f976e90f84933eb0f057d529a5b3af8e3d2c0fe7507ff3e10089f8c52e6b30e9a3fc1a4ec9bbf4d28a92d41d731462a0f6a76c124072a53
 DIST split-0.2.1.3.tar.gz 14417 SHA256 3cf937acd4611db9557838e70cc4fee1d3369d51e2c4d35749e477ad8e7a6ae8 SHA512 adcbc0c8e8705afbe97a0b80cdb2916fb14bf81b80bfedb64ed671ec772c07fa407b0fbeb5b40a8c56458db16aef7e383e774269dc11879de9296e7ba14bcbda WHIRLPOOL 89ab95371dc3eff1c3e1afaa481f9def223a5a0ebe871a367950e49a459137f1440d76a411b8098b22c00385cc2693ef93dd290bb78fb31682810ca7327d25d6
 DIST split-0.2.2.tar.gz 14666 SHA256 f9cf9e571357f227aed5be9a78f5bbf78ef55c99df2edf7fdc659acc1f904375 SHA512 d3e1a0d875632d15b12c0e454188382b705f2b9d93cb99d64f0a2a150ee7b7458628eff95da7da5f51fe9ed4ef3bd8ef3640f925f66e8f6f61253f679326614e WHIRLPOOL 92bc94bb6c43b39644aa1a001afc3372ec140e9fc188f35895ebfd48971c9c7c1cfeebeb1db8b19355b35c8dcaaa72ca5f9d087707e5a212f327a80b5ab186a6
+DIST split-0.2.3.tar.gz 15545 SHA256 a6d100e433fa27eda72127475ba9c55481ca4105cfbb6ff55b67023d00ccead9 SHA512 bd0181b419326219d6ebad1a45683c8ff55d5e485bd669ef76e76690ebdcceddab2b8bc98616b7034de9622d54c6825200aede99e37f376e67f71bf242b1cece WHIRLPOOL c0661fed077984ccc9dc11881bb5c9ab7d49057f147b75072d020d1c94d1c85ee0b0e485bade31708bdb70115bea6c8a4f846db44db605b5993cfcc1bee2265c
diff --git a/dev-haskell/split/split-0.2.3.ebuild b/dev-haskell/split/split-0.2.3.ebuild
new file mode 100644
index 000000000000..0d11bcbcd700
--- /dev/null
+++ b/dev-haskell/split/split-0.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Combinator library for splitting lists"
+HOMEPAGE="http://hackage.haskell.org/package/split"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+RESTRICT=test # test fail when quickcheck exhausted search space
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.4 )
+"
diff --git a/dev-haskell/statevar/Manifest b/dev-haskell/statevar/Manifest
index 17813781e2f9..445376bcbcd2 100644
--- a/dev-haskell/statevar/Manifest
+++ b/dev-haskell/statevar/Manifest
@@ -2,3 +2,4 @@ DIST StateVar-1.0.0.0.tar.gz 2728 SHA256 8445c998f79ef34105ffc928e50f1488505e880
 DIST StateVar-1.0.1.0.tar.gz 2800 SHA256 5a964b0f0baf775833cca57ca1454b48f02ccbe5550dd6ce61cd833c7bd7c20a SHA512 4a3f35943d9a3670e8fd633b916fb0b800aabe98af2f4285a79ff40523ef49ee28ba83457a796f0e4d6f718a1cf9c57790f4124c42cede9a884360803a86b194 WHIRLPOOL dfa070752615a137c1f12cdfb10d6dc7363a673f10ccb356daf192dcd32d7dff5ce1a22a7e1bac3bda1ae76e122854a89fbdc7a42a98695dda8459c3d7f3bdf1
 DIST StateVar-1.1.0.0.tar.gz 4265 SHA256 a19963f014d45163035a3c54e5266b31dfe53a640e53d869ee946efcf9793d7e SHA512 b1f4d6a0ca887ecc81b06b18ab153b68df54af08365c3a04f82cf17fe21f450d884a81ba24faa6acfd1491741f3382fa894d1e3e1f6c2bc103aecc5890982637 WHIRLPOOL e84b7fbca654716909651978079cc69350b3cbedb66c8a4ab8f0b7f546eb7e4fbe7da27d8562f645d965672abd5e5516ee8d45629178269bde50e952d4878765
 DIST StateVar-1.1.0.1.tar.gz 4462 SHA256 0eae79ccc58509f2302cb90f2306d6bb2f1805a2847058fa643d18cc370be5aa SHA512 e279a60255998da46b5616fc3cb6bc95a64f3c5f5b8dd40102990606799db1eaa8e19c8343bebcddae534dfc4104280e4a52a3af593914c02308b53cb81d8d5e WHIRLPOOL f17988454613145d7994a1c442d516263296bfa22e96b9fdc32facabf3d6c353e8ba7321d96c125fb7fad591b06fcca69ff1fe37f830c144a3158b9bc95160e2
+DIST StateVar-1.1.0.2.tar.gz 4438 SHA256 051c4b98bc4456afe4eb26f775ab0aa370e9e12b1588d5865abd5b0aea83c3f9 SHA512 19149fcdb66715d1e15eea59ec670aaa7c817b777d14c5fe6417bf690b2a82fcdce160bbb55fa5eb379bd74fc5d9d3f8407533ce80e061f0d3e682b759e22b06 WHIRLPOOL 05027a9d3e8a91bb7ebb668b8d2d10b2fa4fce2c2248d2367b0ac2c7b99faf8ca171f52d00e4ab6b2bf1d8479b76c46e45909b6d83b4de68b6dca699475d5299
diff --git a/dev-haskell/statevar/statevar-1.1.0.2.ebuild b/dev-haskell/statevar/statevar-1.1.0.2.ebuild
new file mode 100644
index 000000000000..e6dd477d7ad4
--- /dev/null
+++ b/dev-haskell/statevar/statevar-1.1.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="StateVar"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="State variables"
+HOMEPAGE="https://github.com/haskell-opengl/StateVar"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index 3f0926ef59a2..766adc9f2498 100644
--- a/dev-haskell/stm/Manifest
+++ b/dev-haskell/stm/Manifest
@@ -2,4 +2,5 @@ DIST stm-2.1.2.2.tar.gz 5517 SHA256 9f23d655e28fb4011c1464b0de25140b4d5e322d7375
 DIST stm-2.3.tar.gz 6649 SHA256 557f5ad39292ee862b1ce22ed96be03130b404b43288380e6fd8ee3a71a0418c SHA512 92069d6ddf33cb48f098f926322f906f86425d82e433395f741dd899c0e762f55f85ef671ab9137c011d47d74f45a751f9357fc7fd26909ffc143a69eea171b8 WHIRLPOOL 1edfa6678f5ee584e6da698b064e7e29fe3f2d2325c03c3d55f6bee5f7e4a48a05e2bfcdc7fa7dc09e813a725563c018b390d1f34ea64276e7119c1d3e7800dc
 DIST stm-2.4.2.tar.gz 9635 SHA256 c8ee3cd64c266133902619cfff2d04e5f66206f91dbce8dd1182037fbe4858db SHA512 ed1f58f7b08262d4afa683fde16ad79670bb111f0cfc22fdce81614358e903698e6b1bd410428661b1c7d5af50b10dbcf688d8ce5e7ddae86cc55d6d1c5598da WHIRLPOOL 5cdb977455ec25e64c3501118837db05570ee3e0954de6f19920a8ae3d86c4186cd650eb61fdc4f3b9425c38f7581c71fd128c12617b1e164cf91966bb81d8ad
 DIST stm-2.4.3.tar.gz 10145 SHA256 3ac21ea4aa37ee064ac2195dfd274b7c528faa0f88b21c89774c97668026fc6f SHA512 a42d6ffc27318f11be80be16292b5e86a47087780aea5ff7bd27b1d36e966429e3dd645e0c749cc6d957be48a947e63f314cdfb412d7a9adb676d7e9fdfb6e57 WHIRLPOOL 4b9cb73038bb1b239dde2cc321016c7aab545829dc48a2ece390b0cef412534ab1c49507ccaedc4ef6405355d903d5d93cbebbc93efb312fcf8d20cb2717cb3f
+DIST stm-2.4.4.1.tar.gz 10367 SHA256 8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384 SHA512 12a8edb7489995245fb21d9f0782cad87e992f56343d4492eef788370ebc2dcb934193d8602b85b5f3935c4bdb4c9426717b6149437cd7b0bb5311bda4b237eb WHIRLPOOL b98e52bac7d3c9cdeafae07ec28a2481c3f00d4b2c7b9b4da485c1c0d3076c9d63126ac14f24efcfa06d9286ac8e49001690e89829fa14b0473f2e53dfef1380
 DIST stm-2.4.4.tar.gz 10349 SHA256 5dfb588a01b46f427b16a92d6b7843ac81489639bbdfd962e5795c19dbfe883d SHA512 6eb87b5a63422a080863f74c631235690f0e407437c4b68a799fe22b90b0a55d8c9894c5afd3c6099fd02fa6f74e1834a45aafa5768b54c1bd8a7b4d35508655 WHIRLPOOL dbfd36bf9ce3425410f90d0542f9b2a0abf3168631e2807946205e0c240c65833caf191c0d07b9fd5c944a0c45649d438f6535de4fea56e2d3463f9989a6bcc2
diff --git a/dev-haskell/stm/stm-2.4.4.1.ebuild b/dev-haskell/stm/stm-2.4.4.1.ebuild
new file mode 100644
index 000000000000..3b36b7a4118c
--- /dev/null
+++ b/dev-haskell/stm/stm-2.4.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Software Transactional Memory"
+HOMEPAGE="http://hackage.haskell.org/package/stm"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/streaming-commons/Manifest b/dev-haskell/streaming-commons/Manifest
index 04f8ad8821bf..69aa56de2423 100644
--- a/dev-haskell/streaming-commons/Manifest
+++ b/dev-haskell/streaming-commons/Manifest
@@ -1,5 +1,6 @@
 DIST streaming-commons-0.1.10.0.tar.gz 84940 SHA256 187187e7788c85c9492612a7534cc13ef877034b5abea9315b27f721f3957a95 SHA512 698339a745ef3d7109ba845848522ca67dced5437db58eae7455d0073f070acc75ce4cf3112c4ffa4b5453619d1be26e1b2aeecc6c09f6ce669b981f1346f4ca WHIRLPOOL abdf78c7f66af25cae7fd94597636e6f2e876ef5990f346b80062b03173b330ccfad0f309e7231d9f5d3515d14944fd50aecb6afe720a83c29aab9b58786982c
 DIST streaming-commons-0.1.12.1.tar.gz 86864 SHA256 d5bd8dd0b11a13d1d128d15dce31b3f2f4625c7f72d4420e749d85bf170a4fd7 SHA512 43f30a7cacdcec178885cb424a7fd0380682482130ba4019d116468bb87bb187244ff480fc169a27de8192e17c9f17fe38396df1b83827f5dd578112765aa64e WHIRLPOOL 9b9a42682195175cdf0ace602c8bb0ddcec372498ce3126dd74a8435e07d5a78c3b3c04325c03cbdf31ea4414da821a999f0948f43e59cb322663145524d8b1a
+DIST streaming-commons-0.1.15.tar.gz 87625 SHA256 e507beac9ab68eaa8be4933bc1e9511610c581fdfc72621ba51faa913e5fce42 SHA512 2391e0b667f2f011b3d1b09f72f9cba41f69fb16977804465fe4cb6217c1fa2d3461d93d76e3afced283f5ea8b06c57a6ae86a108bd167ed1c9f4bc28f03b053 WHIRLPOOL f95f56e259d1c90dae52e7402482de79cefb63d871dd917b55a58a0c29ac9f984b059242bc263afc8c0f32b07b7d4f5b145d490ec8d9d52a1ba47aa3a72ef884
 DIST streaming-commons-0.1.3.tar.gz 75947 SHA256 0366bdbf4da59cf823f34a31cce93992771fc9fc6096deeb7aabec8a6902637f SHA512 bc08e52564cdc07163113105c61ce03828ad10b40ff10fcc12cc7181054cff7853bbb2e1aef543bbd8972ea2aad9ff293fddb238251d13114e2287f39682bf2b WHIRLPOOL 8d91fca02611b46a952b98456b154373154c84b2a18bb17512abf0368bb10ad36d653dbc5a46c0d203d12cb26d2f3cfb4647fea1e94a83164ff4111ade39b22b
 DIST streaming-commons-0.1.7.3.tar.gz 79209 SHA256 ab7f9e481f0809c34dad20c791862ab558cdba8808a11284a7cf67095b2a558b SHA512 f41de7e9a4e3b3aca909be2ee6a8404b0aba5da1058700354d43d984c9a32da85a677b4a4ddfc7a3a32c90672b142165a4b5b254a5558af1cace502ab2c1e077 WHIRLPOOL eaf3cea0dfed6aec7239120063d68ba32c9c39391537cfa32e26d6e860f5cd408bf2e3748fb025db7c1fcae281cb930390c6f8a90fd4ecf1a7c198960894def0
 DIST streaming-commons-0.1.8.tar.gz 79258 SHA256 0f969599694ba4c168871dda1c70f7067e1a520344fb4ce1bd09a923a70d43e6 SHA512 5644cfc745ec4b0520fd2413f4c1334e814fe10a34e0767982b7fb34d66213b35f33ad826110036a9021dad2eb8d0ade4785b9c2a88b72b128048984e15256e9 WHIRLPOOL 7c15db31edb674ecf2e35ffa186a3448a9fdf0783db6f2a5496b12e5c05e50fee402839c315e907d225a2e5434437c0e3927fdacd6b0a08fa72f5230b37860c8
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild
new file mode 100644
index 000000000000..be1a8a2f0cd1
--- /dev/null
+++ b/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
+HOMEPAGE="https://github.com/fpco/streaming-commons"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	dev-haskell/bytestring-builder:=[profile?]
+	dev-haskell/network:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/async
+		>=dev-haskell/hspec-1.8
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index b0ef047c276a..217b1611db12 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -3,3 +3,4 @@ DIST tagged-0.7.2.tar.gz 5534 SHA256 055b2d9f7124176197f3564bcdbbb62374090c9e103
 DIST tagged-0.7.3.tar.gz 5634 SHA256 eb544fc509fbb98100500f9c61617c0afee32854a6fc88bd873d017e34ffcb04 SHA512 10122b49b7ac0a87243f7fd577fe799046099f1121c912e752d34400a0991e541a3fb9e565235b5335a65617cc7c56519f20922f47e5f1afb8cf8bc67f620b66 WHIRLPOOL 6a6e5e5b4d2b066dca721b78121cf6d72371f04fa7d13c12631b375ec6ad4cedb906ecf9e150687b9480eeda6b7ed4c333ff8c58c531ec795f644070ef26caad
 DIST tagged-0.7.tar.gz 5457 SHA256 f51b0ff097dadfa0508d4fff889f96e274743876c33f13c08335aca80d85e8bc SHA512 c277fd1609b50c6d446bd9a151f0b1200655fbd2a87703cc356abf77b1b4528b54b260f42a88f42a2a1ab31e07f8926d2c7da554266b417806f2513f8837d8a8 WHIRLPOOL 9b1543c597a03349b4bce6a6dfff4b9cde35be03162cf8b6643a980d0be6631ade6b93347a9b0b8fe8032816088f76bdc4bbadec8ba8add5861943176f6113d6
 DIST tagged-0.8.1.tar.gz 8088 SHA256 5bdd98389fcca3aa9c9902d1fb209fd431685ba6530f3051ebe1960fe1c782c1 SHA512 5c97ca55bba57047b263f2e476212ecf3f268de4ef9f8f4b58e155aba7637bdcd04b66006d78500ec9ff9efd48dc4352fe64ca135e68afa23ed0230e503f38ea WHIRLPOOL c2e32e52b76275585ed7c05a414917fcd178ac8692585eb1ffa5d85ae232593afd17398e817a3b43205b8b11d7f221eb3fb4ba126b34e75211eb518d74c3b6f4
+DIST tagged-0.8.2.tar.gz 8957 SHA256 e415d83329dba6c6b604cdf7ab331d321fa62d396f15e79439caa58279d6b77c SHA512 3511d7564e87b853c6514e0f89b2ec617eac175d58dc7de770987dd8f51a3747c191b7bc9ad3003edb433751940dd4c06b8e4082cf0e8c0409eda70a7c486765 WHIRLPOOL d5052cfbacc79631dca77533e4eb4131fed61e2fd091914be64e29b3f25360b2b480ed7cc29bb5a5ff0e99faeaba0ecb005684c47bb2d6390fe47ef6b17d71d3
diff --git a/dev-haskell/tagged/tagged-0.8.2.ebuild b/dev-haskell/tagged/tagged-0.8.2.ebuild
new file mode 100644
index 000000000000..2499495b9da2
--- /dev/null
+++ b/dev-haskell/tagged/tagged-0.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +deepseq
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
+HOMEPAGE="https://github.com/ekmett/tagged"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=deepseq
+}
diff --git a/dev-haskell/tagsoup/Manifest b/dev-haskell/tagsoup/Manifest
index a9a544b46af2..0120c41e8ae7 100644
--- a/dev-haskell/tagsoup/Manifest
+++ b/dev-haskell/tagsoup/Manifest
@@ -1,3 +1,4 @@
 DIST tagsoup-0.13.1.tar.gz 42756 SHA256 1314020e877b8208f42866f4683db40403099595edcd50e556772f31a5e7355c SHA512 01873e5580356d4ff1f473bb992544b5a3c36348029c2e8e1ebcc11ce335040bfddd5c8cf5cebc47c68ab446acda777ee48d457be7a5898423d7bef0c92b87e6 WHIRLPOOL ae4f4f7ece2ec701e1e828d1344300e1ca16c223ac3ae704092c072927df70cb65e1f61dea0f343dd7ecc98fe76aeb7324607713c4b7c8faf3a3810c8e34cde2
 DIST tagsoup-0.13.3.tar.gz 42279 SHA256 32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d SHA512 ee6e7c2459f395facfdf9c28c0903e5279c781d8a5cd0745c2e3648c8eed7fdc84c372b271febce13b8b433ecded5cd7c97a3f169121908f23bb28c2b2f104b0 WHIRLPOOL 92baa4258ccce7948779a86f33f0ee591243d978b3cf148e06be81ee542f004021198bc0f3c4bd7722f3f8f70de217d02a02f2eb24de1f383e3dec14e7c189a7
+DIST tagsoup-0.13.8.tar.gz 43676 SHA256 cff171695c5c559565eff8296bd44442ffff6bc8972e81f3a6c27eb1f13e1c2e SHA512 e05325090380950467f5327c4988c31d8c1cb9fd45668e6926c428d5ad33d589c2dc5c6b7e38c5349a980587823709b60a49c242d5ffdf76b1a58264217083c5 WHIRLPOOL 1afd07fea8f43cdc9ab7e22daf9d99c371fb604302b388f9682fb5d673a931108576bc2c75b8df49e2629403adc69f1edcd184da5b5a479e7f07e5c9dbd92e10
 DIST tagsoup-0.13.tar.gz 42110 SHA256 617eba9017684ffcc4abe3627a43e2ad69d788901facdfa6a3b77f58b363d3dd SHA512 870990576b0c94712f0fffb24d0f4d93f5e717ee31e4c002b41f8579a0c40b2056286bb9bdd8ef93e735bc480ed7b9292282b6cedb7d467693045c8e53c09cf1 WHIRLPOOL 2b628dd7e146449c49450def3ffdc80538b1938a6c9c9c1282f7401d1f6840461dc609a24aa6187f39adebde704ac3fb597bb37121e76983e4d1bbd861b35495
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild
new file mode 100644
index 000000000000..b8acec2e0da6
--- /dev/null
+++ b/dev-haskell/tagsoup/tagsoup-0.13.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
+HOMEPAGE="https://github.com/ndmitchell/tagsoup#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="download testprog"
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	download? ( dev-haskell/network:=[profile?] )
+	testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag download download) \
+		$(cabal_flag testprog testprog)
+}
diff --git a/dev-haskell/terminal-size/Manifest b/dev-haskell/terminal-size/Manifest
index 1f7c44a74efe..97cec3bb966e 100644
--- a/dev-haskell/terminal-size/Manifest
+++ b/dev-haskell/terminal-size/Manifest
@@ -1 +1,2 @@
+DIST terminal-size-0.3.2.1.tar.gz 4175 SHA256 b5c23e964756bc13914649a67d63233f59ad0a813abe7cadeb2fc9d586dc9658 SHA512 1e04705dda8ade9a06f8b369f1033a93ffb94a1b959a556e11f2373b25924adbbab4be0f3e077394e1023e0054044739df13406b69153c1542f4083be82a1584 WHIRLPOOL 1a1dd6c3821777c493bf7cda2128cf345f0c625187ae1ff3f9753c372602ebfd42cb0113cf507f15e3dea5c83e74d4b5cc1a9c7c9ff7d804fe348ecc36f12c95
 DIST terminal-size-0.3.2.tar.gz 4164 SHA256 d737ed86e105fe1217416c4d59a6c10a2523ba86591ffb68001018596aeea66e SHA512 74954333faa4b400b074262f2270afff783fa99101ef54e9545bfe133c1360a5c1d5c2e5234373bcf49b31d699c2d573a40587d3e17ecb7b21a5e73cac810a2d WHIRLPOOL 0d3d59053c2aa95d570961fc91228cb3d37cfae1780709f295e1142d39019acc04585d5f76e313714894afcac03f301cad502b84e1a39a9d48680d44db5a447f
diff --git a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
new file mode 100644
index 000000000000..64de5c691afd
--- /dev/null
+++ b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Get terminal window height and width"
+HOMEPAGE="http://hackage.haskell.org/package/terminal-size"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/test-framework-hunit/Manifest b/dev-haskell/test-framework-hunit/Manifest
index 27b70f7f4b72..7c3da85f6d5b 100644
--- a/dev-haskell/test-framework-hunit/Manifest
+++ b/dev-haskell/test-framework-hunit/Manifest
@@ -2,4 +2,5 @@ DIST test-framework-hunit-0.2.4.tar.gz 2630 SHA256 6bf43eb9227c96e33cc94c7846dc8
 DIST test-framework-hunit-0.2.6.tar.gz 2639 SHA256 f910e18e62615f64fac9bf4938a34cc36fad9d86e6ba31edcb79731e0ef46fc7 SHA512 0d657104dfeaee946b2899ae1d217aa1143eb83f4a52fc1c3ecd6e683a5a6bbd7f2e1ec868f35f6159689c214eba7be1077c779116c0e8a90910a09a8c6d22a0 WHIRLPOOL 3b2afb82fbe73cefd12e23a7d7c2ddb2031d4ecb53afdabf01360746a06d559bd361f4ba34bff2ff0f369fe5b07910b21dec39b66e98fc48f7e2bb37c06edceb
 DIST test-framework-hunit-0.2.7.tar.gz 2633 SHA256 cc8d21df58cdd85bb4ae5871e1a28c6a9e1c0fe618f3c899fdefd95d2211e4b0 SHA512 db3edad323edd8441a0c8ca980a2113901c66dca3076cd971891a692d6772b5df0a863b004094a71b707d9014add2f865f8c1072cb35e2d5fa85351f7f2b49c3 WHIRLPOOL 34c07b01aedc99a629dddb112a7512d2ea1176d6b6cba4cf3393608294dcb878989471ba1067072f76e15c9bc4781eb7877f8f5a884e54e4cbc64406fb796032
 DIST test-framework-hunit-0.3.0.1.tar.gz 2690 SHA256 d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0 SHA512 fd8d0d7da7056e48322dc9b57db225607b79df992106b4965e90dadc9d976cb87b11f12e83eeeaaa7f4c9f3628cd39151328c03b0f79c7c4885938616cf17e45 WHIRLPOOL 4f8fa36c9b7c4c4378cfa12c49c043deebbe3b7b2e1a8d27b4c394d0cd66691937207c06a1665407b70f15d00a1309cc517495d2e3222fa9584b2debf21b5b83
+DIST test-framework-hunit-0.3.0.2.tar.gz 2770 SHA256 95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8 SHA512 068ca4326935746769aa4023076e9bd85d1753073c6e67d88daa6ccf2a69f3bafb87c3b03fd5ada612f6ddbdf2447b06ef8f853675cf0efe9eafd80606c40e32 WHIRLPOOL df9fce6cc0139cfd0682b591d7882061e439f7dd5ab627ab448adb48c26406d03c7c11cab911c1d73b1756600bbf9d46e0f96f7c848ffceb237c2fcd84fd3f9e
 DIST test-framework-hunit-0.3.0.tar.gz 2679 SHA256 04b1536f4d40f04a65d0d540c462d45c50301014c384339f19e90d9cdcba8bcb SHA512 39a537a56d3fa7f6a996b58a40971265acf4103608f10386af2c7d8d941cc416afa504af2f2f70b91e43616dac1231d384e2fc14835f5a13e41fd27d42f708ed WHIRLPOOL 647d755410b025d18d8ff8e9fdfce2b3a7389f9d8ba61f577c66fd312446b5fffba86dc2485269c25856092911b7f9482a9f0465a20945f6f2f63791748146e9
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
new file mode 100644
index 000000000000..cef108fa26d0
--- /dev/null
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HUnit support for the test-framework package"
+HOMEPAGE="https://batterseapower.github.io/test-framework/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.4:=[profile?]
+	>=dev-haskell/test-framework-0.2.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
index fead50e8f7ab..eaac736ed1eb 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -6,4 +6,5 @@ DIST texmath-0.6.6.tar.gz 46785 SHA256 acdadeb74208579b8f35d63abb8c9b629cd458f12
 DIST texmath-0.8.0.1.tar.gz 1595283 SHA256 9625e7106c76199f1228777569a49900bf300e1f4880c69c22986358d5d5c8cc SHA512 2242dd52ff71813c433cf495e01c091c5d8c01ac95b145eca8f693b5a87db721a09798f3a925944dec10f9057357e7d32e300ddbe6f6f9c07c0e961f28bedd31 WHIRLPOOL 9148be2f1cb0e4fbc97474295ed2b50c5850403ef51293750da425aeac276a7dd182ff9b6442d3902d2fce2adb305989a7658dfcfb25fefb06df222e2ab200c5
 DIST texmath-0.8.0.2.tar.gz 1612561 SHA256 47b9c3fdceed63c5d63987db7e511a38ea8ddf8591786ef56efea734a3c31f86 SHA512 c5286e428fb014cde126cf04600078c18ad2da81351e2d3dc84dfc180d2e4f24a61b2091f625893bd84c99bf0249769885bc501265ef461a48cd0e1f6cb141d7 WHIRLPOOL e0b5f831112c2e4b1c0b59018ad1550cd1b879509206a7f2047efb5396451786c8648aeca87650cec2aab6dfd14d4d4c86ba51aed18ead03e4197bb2cd907758
 DIST texmath-0.8.2.2.tar.gz 1599187 SHA256 a1f492d8bfdd9a28f9bbb546fd335e285b7da15ab1e7ac0cc0c96a8e42cec2f3 SHA512 2c8806ab0386acec6ed963a4574a5a24a07eb49a833a51021fef48e3a975012a083bd43fc4172399265430d9599b79f3ce1e5edfe785e80e92f259efc9dc674e WHIRLPOOL 0c9519b9979caf138763b8a0e0e42287afcef1b578959b70b1abefc212d2e49047c5ee375694badc33f201054205dfad15a68c201346b76f2225c56f579a0cc6
+DIST texmath-0.8.4.1.tar.gz 1599833 SHA256 45a9c779775e4e6effd7606bef5c179524b4fb88dca952c2decd3fa82e6c94f5 SHA512 e7bc52235e23e890134005d6a2bb4169f6a55286eea41ba55430918acecd3ec09105adb511ed0e2df43ffb760bd888d971c96efeb544028c6b7ab89e06242ae4 WHIRLPOOL db1545445d39de75a5c8121a3ed1447ce347c4aa9e8b2fcdee1c94f7f7a29de356fb7d1f1473d0b2582b082fb8efed55f2bd0b6d40f62474677170c2079cc30b
 DIST texmath-0.8.tar.gz 1613635 SHA256 eb9d558a67ac429055ebf70484b36a58ddbc9df1be59dfbf13146247524911c8 SHA512 561aa51e401ab27b50bc374e665aea8825f105b5dd24d2ccfdee7b59ffaa58f12c8bb87ced04bc00e5735dcde1209f352311b4d5f78929a48ac2e60733bf0fd8 WHIRLPOOL 2280ace00f8c25dea5d2101bc68a5a1a5e07d23d9772bffde9f17bac74d15c8222a5f844d7fc7d650ff228c3bed0944c064b767a0bf9e1074275426eb1d04c91
diff --git a/dev-haskell/texmath/texmath-0.8.4.1.ebuild b/dev-haskell/texmath/texmath-0.8.4.1.ebuild
new file mode 100644
index 000000000000..397934e914db
--- /dev/null
+++ b/dev-haskell/texmath/texmath-0.8.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between formats used to represent mathematics"
+HOMEPAGE="https://github.com/jgm/texmath"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable +network-uri"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?]
+	>=dev-haskell/parsec-3:=[profile?]
+	dev-haskell/syb:=[profile?]
+	dev-haskell/xml:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	executable? ( dev-haskell/aeson:=[profile?]
+			dev-haskell/split:=[profile?]
+			dev-haskell/text:=[profile?] )
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/temporary
+		dev-haskell/utf8-string
+		!executable? ( dev-haskell/split
+				dev-haskell/text ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index c7f6c7d2ba81..b0b71273b1bd 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,3 +1,4 @@
 DIST text-0.11.3.1.tar.gz 126477 SHA256 76aad4a647cad7099b5a693eb9a4bc5263f7751392d8d1f87b14c78e2069559f SHA512 78e9b795ebcb4e43be42b34c3f5829e0f5030d93cb6dad59ca2eb4c7df3a5e338f65dc9f90da7b752cf2b1c15e8d973a25293a6418a4abed6e0ddac9222fb3e6 WHIRLPOOL 44621a22c5afdd93e95670dc45e1c8496a743aa7c97d5d7466b89a0170fe5425a34b7ebcd11f26bba4d2c27477f7256d20b1daf7ed60c5a5e5b53fc9236d3912
 DIST text-1.1.1.3.tar.gz 138063 SHA256 0c7c94ee281deba5f58aa2a63c0f7a624227a570b5d5b49c807f2d9b08793ffb SHA512 bfa5301827c72cbb3346fdb485e10094326a7cac71e01bba700ca0344bd4069c5b16c590dd7c38ee85969be06a2d3fcd760b34ff6f98eef176e7e8c325739490 WHIRLPOOL 6a9ebc05cf16d33568f43847be1b67c779eb9fa6c2c2139c5a6e905cc7351a269f14aca819303c60fb3461b306211c7024ef4f5ad3a07bede03536bd8e40a8b0
 DIST text-1.2.1.3.tar.gz 145946 SHA256 98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f SHA512 2428db4122c7b0989661bc42870e18068315ec7a0a4a2a051749a4c9b18cff1781d83aac064b73b032f44862c3f8fd849f96d2257df87401d1be6c109f84614d WHIRLPOOL b26cf8679e9e13217a549d86fbd780b5fcd49bfff2b75fc7cd39231117a2c23b14cce3f37dc61447c4bb517a878de872e5e25f501a9634b2688eff0fb7f431f5
+DIST text-1.2.2.0.tar.gz 148894 SHA256 3fb3921488b4c10f1a389f4ad1a1ae44cf1a6d1ce4305a55d1d7c745cff50088 SHA512 832b0430581a06cfdfa2a5c83fa2720e3f4825ee0aa9c6b12ff6ccd424a9e3a061c9ae7eeda48fe7a9f077c50e379abe2eee3fb05bdbdec4d38115b5e3695f20 WHIRLPOOL 19010fd219e0d1000071bbe03542c8089802c0ac6f66dd4ce26699c4c4a191a7a21af8a30fe5e69541da942922197bb61758a8beae810c4a4ba7f487a8e34fe7
diff --git a/dev-haskell/text/text-1.2.2.0.ebuild b/dev-haskell/text/text-1.2.2.0.ebuild
new file mode 100644
index 000000000000..42ba63d8d714
--- /dev/null
+++ b/dev-haskell/text/text-1.2.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -developer,-integer-pure
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/bos/text"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RESTRICT=test # break cyclic dependencies
+
+RDEPEND="dev-haskell/binary:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.7
+		dev-haskell/quickcheck-unicode
+		dev-haskell/random
+		>=dev-haskell/test-framework-0.4
+		>=dev-haskell/test-framework-hunit-0.2
+		>=dev-haskell/test-framework-quickcheck2-0.2 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer \
+		--flag=-integer-pure
+}
diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest
index 3876d75544ba..4ff8bc818954 100644
--- a/dev-haskell/th-lift/Manifest
+++ b/dev-haskell/th-lift/Manifest
@@ -1,3 +1,4 @@
 DIST th-lift-0.6.1.tar.gz 10453 SHA256 ad4cd5fbb4eb0ce5f35511d101b8460715a524e9076b4d4b96561a6081be3154 SHA512 0db931485a9753a1d8d49e962c0d16781fa4a3a4eef1b8fabf6f0d6967c11987aa842c7f13b2bccfe3d2e4146c07c1bd3060dfb1c78444a843e495dd566ef09a WHIRLPOOL 9d2b7d9c3f13a2ebfda2f96c02c96be7661c3dea9a384f946432d54b9425eab935446953269dddf82b40b518d7614f6b68087c27bdc3eb582e893e6da5fe03e8
 DIST th-lift-0.7.2.tar.gz 10980 SHA256 755c2477d4f1c77d9da73ef5a824b34b1c382aa98833b64ad7d9255813e8824a SHA512 a560d9b7737a1b8a9ebb656edea035dd452349e4dc95af92bc152843b50960ebe498a1577a5c16eecaf6cb937fa72b67d7eff19aaa70293904adaa10e99e4f50 WHIRLPOOL 6c3fe7a74cf2b2bb8b30f806381c5c054d925376c5a6357fdab67f58109f729e6fa144a63fc998d9ea0a412a82e665f671782235c3ea1673b6374265e79947ae
+DIST th-lift-0.7.5.tar.gz 12147 SHA256 f3d483f1f85556e0be70b3c4f6570bb2828cda68a83b9d0a70f035c8c29cad8f SHA512 79d01b50d424206602c810d2cd2c810b85a098737926f343c47c818bd43b2dd09c32964b52fa6fe4acc2462be16bcb4142b386337207321352f3e6d450158589 WHIRLPOOL c6dbc032b4b05d5771c28347c9ec788b5b64ab6c5a7b631bdaf17d25dde7af677469fffe48dd0dbdaada23ce0d98c4cdcc8604e74e52a764211bf9633711d4aa
 DIST th-lift-0.7.tar.gz 10921 SHA256 ea5f6c6ad93347b4dd31386c6cc7f2679c674bc16cde4cb79275b0eaa29905d6 SHA512 43a99ffb5157e354ffb522e65cd6a5cdae28431ef63a12563c945ffa966182266152add4e8731d2bba95e4931bd9c2c8b831201104ea2bf467210d54c45f9f68 WHIRLPOOL 1f02e047fce33fb70a4caf41340669b603eef93a00b9eede4f20d954fbc5385567af51ed11555b673367fb2194180f6031a8699e283e69195e825c4e2d767777
diff --git a/dev-haskell/th-lift/th-lift-0.7.5.ebuild b/dev-haskell/th-lift/th-lift-0.7.5.ebuild
new file mode 100644
index 000000000000..2e50d15f943f
--- /dev/null
+++ b/dev-haskell/th-lift/th-lift-0.7.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
+HOMEPAGE="https://github.com/mboes/th-lift"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/threads/threads-0.5.1.3.ebuild b/dev-haskell/threads/threads-0.5.1.3.ebuild
index 5b605febb711..2f01f4f85acf 100644
--- a/dev-haskell/threads/threads-0.5.1.3.ebuild
+++ b/dev-haskell/threads/threads-0.5.1.3.ebuild
@@ -24,7 +24,12 @@ RDEPEND=">=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.9.2
 	test? ( >=dev-haskell/concurrent-extra-0.5.1 <dev-haskell/concurrent-extra-0.8
-		>=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/hunit-1.2.2
 		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
 "
+
+src_prepare() {
+	cabal_chdeps \
+		'HUnit                >= 1.2.2 && < 1.3' 'HUnit                >= 1.2.2'
+}
diff --git a/dev-haskell/time-locale-compat/Manifest b/dev-haskell/time-locale-compat/Manifest
index e32d3dbb3ec9..47f6dffc5618 100644
--- a/dev-haskell/time-locale-compat/Manifest
+++ b/dev-haskell/time-locale-compat/Manifest
@@ -1 +1,2 @@
 DIST time-locale-compat-0.1.1.0.tar.gz 1933 SHA256 25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455 SHA512 1192841b9065f052cd03672f587e4dad04fb6ee983159014c582c31da6b2d09dec6ea0c728554ee3aa04478de686d155075dbed9cc5cc258927df2d9d896e5b6 WHIRLPOOL efa6fb209519c05c5fc6767bcb628479a6948426c3d3f043a41b6f49d09b6f9621f27245759aba83ae2e31b72d4850d7c3c6b844f1cb036842e547ccebef2bc0
+DIST time-locale-compat-0.1.1.1.tar.gz 1861 SHA256 ced6a61e81671f266cc3daf7eee798e5355df8d82163e7e44dc0a51a47c50670 SHA512 69adcc66c933900768de5dc73a654aa226f074ce0dbe0c9db8773d31cc79753e5148145faaae198d4040cc6a23da6372fea6e3f48e1c8f6110a318591e9d6f48 WHIRLPOOL 90a35e42385436cdc057d32915a00a4e866429033c79ad8543d40f6f799d3b4b9959d3c419b103d9ea00884f2f68ae390142d323108b0f3b97510461bb789fc3
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
new file mode 100644
index 000000000000..51fd04512f0b
--- /dev/null
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility of TimeLocale between old-locale and time-1.5"
+HOMEPAGE="https://github.com/khibino/haskell-time-locale-compat"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/old-locale:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/unix-time/Manifest b/dev-haskell/unix-time/Manifest
index 41fcab25fb9c..8d1e5141d402 100644
--- a/dev-haskell/unix-time/Manifest
+++ b/dev-haskell/unix-time/Manifest
@@ -4,3 +4,4 @@ DIST unix-time-0.2.2.tar.gz 35889 SHA256 3573975b0a2f4bd762ef750dd82ffb4f218c722
 DIST unix-time-0.3.0.tar.gz 35955 SHA256 8af71ee212eb2a4c8e5a9b2bba1ae2e1b34eaff778360773e53a6efda08abc40 SHA512 d7629b0cceee6fca6e87a414eb29bffd157936ff8c62c9530e419e25b2425102ec2ca64255de1ffda95446017c911ad8cb268c8807a1e5ec706418f26d24d833 WHIRLPOOL e9efadbd935ce799e2b4dc381d7c1a7efc50ec2663b34a7da85ac0b25f2bf3c31b82ef79f872531456a30b51d4bc58833a2b162e130e94a2568c3f75bdbd5202
 DIST unix-time-0.3.4.tar.gz 40183 SHA256 e511b17e3dd905b2e71e4c22d5a245bbc71fc82794f16a24dfe379f5d700d1ae SHA512 f12db1c46b8cd5d8ed00aa71bfec8bc9401f79bd1f3a23046570996ec870540c1a49b9670be042a3a29767b1593e1483ea39168449b23fba37ad54d0ee47229e WHIRLPOOL f33015f14efa6d39dd980102740f2b04f4a2181afb39b5f96367f118e2c572d4590948a8ccfcc46e97b388e77ddbf4e3f1ad0fa869de3391b4beb1f1d598c616
 DIST unix-time-0.3.5.tar.gz 40201 SHA256 7f1c58cd0328bbcb1d050af05670bc6f44dea3ee0894f30c6f87ee4a0d01675e SHA512 8da13cd8e9a32ee8ce4ab9430eab951d84350e4c459948f4e5e833444f1f266fbac6b6fc08876e326313eaf92e31500b325825b1b2c4fb22c551efdf6e5b9db5 WHIRLPOOL f85e9fc27196bd185c87403c7846bcf699099a47064ff0fd09c87d88af8a5996a167b76158ef6def42aaae5ce8fcdf6fee0a1b70e237f4d0b0539bb9f9715a31
+DIST unix-time-0.3.6.tar.gz 40180 SHA256 5d15ebd0ee74e13638a7c04a7fc5f05a29ccd3228c8798df226939a778f7db37 SHA512 a7ca1086d2a2a15bebdaad80e3e31cc3be403548650d6c490dd7aa3af14b017ad2034320f82c3c7729661a046156e41bb50acf6a8fc1aa1db8dc8a62522c03a1 WHIRLPOOL 9a9e1de92d3a49a7319a384eca7eb1864705ff3d03331a575cff8f114486210afcc0de064f4d53f0436236b4a9267a962ea0267ff6b79f71a96edee3ac8b94d7
diff --git a/dev-haskell/unix-time/unix-time-0.3.6.ebuild b/dev-haskell/unix-time/unix-time-0.3.6.ebuild
new file mode 100644
index 000000000000..cc693108fed8
--- /dev/null
+++ b/dev-haskell/unix-time/unix-time-0.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unix time parser/formatter and utilities"
+HOMEPAGE="http://hackage.haskell.org/package/unix-time"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/binary:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/doctest-0.9.3
+		>=dev-haskell/hspec-1.5
+		dev-haskell/old-locale
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/unixutils/Manifest b/dev-haskell/unixutils/Manifest
index 10f31de37e7c..4b56617fc30d 100644
--- a/dev-haskell/unixutils/Manifest
+++ b/dev-haskell/unixutils/Manifest
@@ -1 +1,2 @@
 DIST Unixutils-1.53.tar.gz 12116 SHA256 995eff60414e4f5ed84c3ce4b78549fcf5d6e9bf613f400b5456b0996274083e SHA512 f3e2e1082d07d84a7c1918431146c607c62737320c744d2cd671a5fc55a02b6d189e4dc79c7451a8f5405369da78ceeaf046911b5a1f85b9b5205f5d618c9fc9 WHIRLPOOL a415ee054fe8fa57bd9e5b03468d8724ec055db133b73dc32c48c00fd068e02f10f5eb31495a68d4fb4d9cdcf8aec54bee5e82d0459baeead56a1f15c4197340
+DIST Unixutils-1.54.1.tar.gz 12177 SHA256 f9295529744cb2658364956f376ff506dc1876eb2b0148e5b09c1a4bc4732644 SHA512 b8395cf6778c18a2f36a45a927d24042fd144ab70c6c092e1be36b22c59bbd1f0151cbe703d9db98dc769eba41ca9eb89cf60e87f5a6bbb32d6b64ef97c45665 WHIRLPOOL e1091db0d351b2e6913eed80fff507b77c8a2b4daa34539bdc9f66d6138b39837d02e23703b5f38dd70917ed13fdd6753c2f769c726c3bd704764feb4b555747
diff --git a/dev-haskell/unixutils/unixutils-1.54.1.ebuild b/dev-haskell/unixutils/unixutils-1.54.1.ebuild
new file mode 100644
index 000000000000..3fdfa355249e
--- /dev/null
+++ b/dev-haskell/unixutils/unixutils-1.54.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="Unixutils"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A crude interface between Haskell and Unix-like operating systems"
+HOMEPAGE="https://github.com/seereason/haskell-unixutils.git"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/process-extras-0.3:=[profile?]
+	dev-haskell/puremd5:=[profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	virtual/libc
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
index ea54208089f4..f3f7985c9529 100644
--- a/dev-haskell/unordered-containers/Manifest
+++ b/dev-haskell/unordered-containers/Manifest
@@ -1,2 +1,3 @@
 DIST unordered-containers-0.2.3.3.tar.gz 25782 SHA256 b1694120cb2a14494c93a85a31c310900aa384e7468c113f71b06a325d0a5627 SHA512 f869ea72abce17cdaa1d97dbd566cf7ff08f4fae3b45b435c36da5ee1250ca4a5cb4dc852e8713948c8f3dd8bf0662e5a95e370cbe7d18756e1ee60493fc84b2 WHIRLPOOL ab19aa99814bbbe3a523d9700a4583ad477e99c6500b4c926384e050c95bbc01d16a6133747df4849bc773693c18c92148e7418633ccdd68f9830c46852316e3
 DIST unordered-containers-0.2.5.1.tar.gz 26093 SHA256 6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a SHA512 179f51d28efce91198d7710cb3008d5fb913aa43673629c3d3910f312dbf9f56706995df743fd0dad740a3ced2290c4089df7a526c8f6c4ab1e6f8b8e71a87b7 WHIRLPOOL f8f6b1e5b2a62705d12e6b2a06856a6ea4b227782744fdba242fb29d41a1df99da73ce1f1c696db9afd98ba7a6bc427a83a514cf0670532bb2f52fa71949b71c
+DIST unordered-containers-0.2.6.0.tar.gz 29415 SHA256 5f9fbba5f616344bd3b1b633d45f820cf9c840ad101e1110e698abc77d9de3f3 SHA512 9038bfa20f6c24129ea5136bfc236ac16a8fe43b1fd617c33df00393eca4d07e425cb371455b81a7eda27c610d0ffd5a8a6039f59fbfa67418dfedeacc06c1f9 WHIRLPOOL d11778beef71611784f9d2f2417be56c3863d8818c29ecc6f6e1ccb381e48491cb4d8ef17d6815415a3de562c5d5436be478e65454937876487556971364300a
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.6.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.6.0.ebuild
new file mode 100644
index 000000000000..a5bd31772a07
--- /dev/null
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.6.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient hashing-based container types"
+HOMEPAGE="https://github.com/tibbe/unordered-containers"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/chasingbottoms
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4.0.1
+		>=dev-haskell/test-framework-0.3.3
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug)
+}
diff --git a/dev-haskell/uri/Manifest b/dev-haskell/uri/Manifest
index c41c6b80a501..55250ce805d7 100644
--- a/dev-haskell/uri/Manifest
+++ b/dev-haskell/uri/Manifest
@@ -1 +1,2 @@
 DIST uri-0.1.6.3.tar.gz 5331 SHA256 321165b9897aaab108170ee3b6073ec718150ebf650a3f76042a0e5c89cd15b6 SHA512 0d52a7f19fd2a88ba30b2981e6438dc07c25a6e522b694a592ed223b4f804390c26c2b686b790d326514c994f23e571a369f5cdefa62dbfab871065a2a77fa41 WHIRLPOOL 02447729f2ac03c5cb98d67ce007f519703f6aef2e061dd371bb5447237a0339c0d0498a284b9de11714caaea1d5fb5141e1b3ea1c8411fd6c6f2ae74ac28984
+DIST uri-0.1.6.4.tar.gz 5343 SHA256 a90cd3d3ca1d33740dc732f14773266a7707901a872747a6e543129cab4ee409 SHA512 0daa5e03fa7a3b767b4c523bd334017116432898d04c2b3250e1335ac217ed0f9b915785b200f6eb73127d349954b50dae6b5f979a5ba9f39d4d1ae2589c2a07 WHIRLPOOL dec401d032d20b7f0a6f340b4cb7ee40e222c8e02bf631e25e76f69db33efb7a49ca4f11947a4f3ce5ca1291daa1f413404918f29a5b000c7671a3b07b792bb0
diff --git a/dev-haskell/uri/uri-0.1.6.4.ebuild b/dev-haskell/uri/uri-0.1.6.4.ebuild
new file mode 100644
index 000000000000..0e79ed262d78
--- /dev/null
+++ b/dev-haskell/uri/uri-0.1.6.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Library for working with URIs"
+HOMEPAGE="http://gitorious.org/uri"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index 5b7b33e6c977..18b43dc621e3 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -1,3 +1,4 @@
 DIST utf8-string-0.3.7.tar.gz 8845 SHA256 785b4b31476adab9d4ea553a9a6b590acb0b906836abb3facd218c18b8eea9e8 SHA512 44e64e5ff42a2e4defe97d78468d070791ad82f0405173046666de398b14e55b8758a34ae624086dfa597d46a67eb12886375e04d58255e18e6d1b446c7efd79 WHIRLPOOL fe552302ead77fcf96b47ca3f37be9081892e0ea442799a2874aa423baf6874f42593cf6c119ecd0fde479df15d1cadc3b646ba923326a4f3bbddecd6ed5b66b
 DIST utf8-string-0.3.8.tar.gz 9129 SHA256 80757cbc00197ff71311dc8c1ca00284537442c2dc93f06685d369a6816d49c0 SHA512 70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb WHIRLPOOL f6fc065ad16cb36ef068c3c15ade87cf2305bcfa630b9e5187429aa2b8fdd6893ed158ff77c42efe41d1dfded1ca3a84d0905cfefb3f7fea06debb9f30dc97d6
+DIST utf8-string-1.0.1.1.tar.gz 8667 SHA256 fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140 SHA512 2dd647625478c9738b3af5e23e1e5ff92968449ad74e6d53dc308fa0f2b08b63c421a1cbe5491dd260b9b32770ec626843d320a09b80eb984211dba53934b965 WHIRLPOOL ce25c5accfc52be131c60b7ed01e5bf8d540d5acbb76dd7681a948d444539ecdf0b21b2489f180396db10367412fa54df5ff5f9d3e6ac9316687b3872bcfaec9
 DIST utf8-string-1.tar.gz 7707 SHA256 79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08 SHA512 1156d364a0478aa4ede1b194c3ae210cc04b1469b30e9f13ee35b2739ad03eadb2ac3674dd5a646e894c2eecb883f0a70966caa709bddab483fb707461939a1d WHIRLPOOL f1bf2e4558fa9ae71c982ced80124ebe1d8c44a6a31576c6da7da749c0dd385bf23d80517f97a50d70d9848db5483c9248f70f5907fbb6b6f14f64408d574ad7
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
new file mode 100644
index 000000000000..6ae6812d486b
--- /dev/null
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Support for reading and writing UTF8 Strings"
+HOMEPAGE="https://github.com/glguy/utf8-string/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'base >= 4.3 && < 4.9' 'base >= 4.3'
+}
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.2-r2.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..7d2d6de738e2
--- /dev/null
+++ b/dev-haskell/uuid-types/uuid-types-1.0.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type definitions for Universally Unique Identifiers"
+HOMEPAGE="https://github.com/aslatter/uuid"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	|| (  ( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
+		( >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.2.0:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'HUnit >=1.2 && < 1.3' 'HUnit >=1.2' \
+		'tasty == 0.10.*' 'tasty >= 0.10'
+}
diff --git a/dev-haskell/uuid/uuid-1.3.11-r2.ebuild b/dev-haskell/uuid/uuid-1.3.11-r2.ebuild
new file mode 100644
index 000000000000..61d94d603855
--- /dev/null
+++ b/dev-haskell/uuid/uuid-1.3.11-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
+HOMEPAGE="https://github.com/aslatter/uuid"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
+	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'HUnit >=1.2 && < 1.3' 'HUnit >=1.2' \
+		'tasty == 0.10.*' 'tasty >= 0.10'
+}
diff --git a/dev-haskell/uulib/Manifest b/dev-haskell/uulib/Manifest
index b4c2a8e794e0..eec7a54d7c85 100644
--- a/dev-haskell/uulib/Manifest
+++ b/dev-haskell/uulib/Manifest
@@ -2,3 +2,4 @@ DIST uulib-0.9.14.tar.gz 44115 SHA256 1f643f741a8238344d33fe399bf57d08d4dab525be
 DIST uulib-0.9.15.tar.gz 44135 SHA256 f58b806ab7ec896f8d66b5f51742fc28057fbfaba969102b26808d4420d46310 SHA512 a7c8b6cfda49130cbc5ebf34e66a21710f4322022720f9dfef9d9488d66afd7a2490b14a022605285fd65d5087fa2614de5184fd94f18596ad14952b266c90e4 WHIRLPOOL 30b12184e8bae3d3d8c145ff39c12b6f576740146df83c91ef9fa4422fa119d5176384a0f27d081586acf0c84e152697408a795a2810aa4741ae8cbbf965f99b
 DIST uulib-0.9.16.tar.gz 44333 SHA256 834a75fb88ce508350ae974fd5b66bb0c60e56f2bbb77ca430b25327c289a919 SHA512 89a9a2d34e8cd5e367a479f3d9bd6083abc140c247ba48cce5a39f2ea0835bee67c57b7c6c5850968d2f4b5cbc78b2835e85c8255c041981650d62d40070cc78 WHIRLPOOL 40c83a561259055775986b04c0c10e76375256a889139f188c1900288084e0ca350b2fa8df5079063ab20efe92bb25c2b06706a88a89c89a1f3e6e53de0aa375
 DIST uulib-0.9.20.tar.gz 45120 SHA256 e2bb4d7b2aa0d3e987748185589d7d25b453d3ee448a468aab8971df651ee7e3 SHA512 aad2101ce08aefbe05b3703df8c83e37a84f158ab0dff8584b6ffdd98c1c723a1238083496c796fcfe49863b4031dcbf9f1c1d3c809e1e0229645174f2de0ffa WHIRLPOOL 466ae305b83ee1a75966610de76da69c711f9b9d553968de4993f29d5233a1ce429ca455b0b6f8f12b0503482cbff1906e4b06d42e16cad0668eb47bcfd7e726
+DIST uulib-0.9.22.tar.gz 45487 SHA256 cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad SHA512 34803448aa29870ec4776128565b52ac52da4395425ba4fdb6fa38ec45b5af59cb89b2b88e3502e409707491863f88b6d95b13093a15cf04a7c58d24244955f7 WHIRLPOOL 7e35926190fc24484b898f59d5b299d4c1adaa0bec1e7ffc3f90239eff58ebadf9157c9cb23e0b01329f3d7bcd68816bdaf8413494dcf288379b1b2fad7b25f8
diff --git a/dev-haskell/uulib/uulib-0.9.22.ebuild b/dev-haskell/uulib/uulib-0.9.22.ebuild
new file mode 100644
index 000000000000..589495686cf9
--- /dev/null
+++ b/dev-haskell/uulib/uulib-0.9.22.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell Utrecht Tools Library"
+HOMEPAGE="https://github.com/UU-ComputerScience/uulib"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
index 534f7d7a3bce..fa831fb97084 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1,3 +1,4 @@
 DIST vault-0.3.0.2.tar.gz 4849 SHA256 eb4271e33ef917c71a6da250dd922f5dad9aafd81b1fcfda72c170fab9553bd5 SHA512 b5e7b030d654a2e5907fc91d39efd5878c172bf72299f08be78efcbca56f0d8d0f0b6979b84bc83198a07ae3ca0df7325b30157f4cc8f528436a5e6848e056b7 WHIRLPOOL 9b4533f28db68f32dc9497a8b2180251c43a9df16a0f4f56f01f0575a0a9aad0880de0c67f727f5a8db886405524485e8b7286686619e02baf16bc17dab84f1b
 DIST vault-0.3.0.3.tar.gz 4906 SHA256 056ad8ffe6059d005b12159cdf781cccd14193bb0b30e960509b3dbee438f272 SHA512 142bd654c5ea0cdda17429d130bf44901cfb197068db2aa671f564bd2ff1ce61f517d4fa598990bd3c3ce33181f784b5e4524190895d0efe8f4b57d163096fb5 WHIRLPOOL 9686a47f6d80babacaa695b3c2f96ed447764cbf9da7248c652242ba0439340fd82ae689ac24aed11d8fafe57d2cbaa7c0332f18943be94b79e907c1488e1ced
 DIST vault-0.3.0.4.tar.gz 5009 SHA256 561ef32877935067e458333a44a37f15b4063559c4cb4ddc412ccf705ec6062a SHA512 b2451386f8533a86ab092a62b0b6ad02ad33947e57f7886edaa5b9d58fa76c151219661f1428c603503f4c20d484b46ac2801adbb79d15c970a3249485a34e11 WHIRLPOOL 5af223057267abcd2daa01a078e24ca6cc873ed68e9d782d2264bc83237618ee0bc6a79f8b69c897726ae03350c02b8263e6bcea5c9765107ae4eb6f6c35db90
+DIST vault-0.3.0.5.tar.gz 5142 SHA256 c37bf617db6b39333de40540ecbda8ae644ec6cc8e18bbccbe5d976aeb8cdea7 SHA512 be66e8f3028cdf14ac89dbff64e326a11db23dfece1e3f39d2e70eb1e391bebbe7b569969c7c48a1fabae94ac2ee9623f6b3dbb75139f34dd28f2f2ef8eb69c1 WHIRLPOOL 5f89ff7a30ea48501346c669a16a0011e483e5a1adcd1ec0782524cffbf34195aeca27d14e83ef8af9fe366b0b285db9aca697bc7c7625f0740405d2aee5515f
diff --git a/dev-haskell/vault/vault-0.3.0.5.ebuild b/dev-haskell/vault/vault-0.3.0.5.ebuild
new file mode 100644
index 000000000000..906fe9a99a14
--- /dev/null
+++ b/dev-haskell/vault/vault-0.3.0.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +useghc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="a persistent store for values of arbitrary types"
+HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=useghc
+}
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index 3327b40ac593..da6ab7365abc 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -2,4 +2,5 @@ DIST vector-algorithms-0.5.4.2.tar.gz 22938 SHA256 c42c35dcf23cb60b874e50d6fec89
 DIST vector-algorithms-0.6.0.1.tar.gz 20273 SHA256 85fd0d102b2f3bc61e2241959563e10b58f233d9fd96ff4b5083d55618f87136 SHA512 e38f25f51c347df844cff181ba99368ac2b7389fdb190ea5bec97fc8b4a26ba5ee2df27ab38884d38d505d88fefbc56be427724f05f85646906dd2d0d583fdcf WHIRLPOOL 2e47adbab21724e042e692577141dab45a3a33f4d726ac49acb82998a6c1fa7347ca8b71fb3eb2f6a5e7321836c92195f8b1b52ec9a1b8dc9c0f6cd47bbc0797
 DIST vector-algorithms-0.6.0.3.tar.gz 20273 SHA256 c42eaddf416b37c7c281eadb3ce845aa628a5853e381beaa698aebe30359e4cf SHA512 40743d262ac410c9863924572d62dd0bab87b07521ab0df29d4dfa8c35ea873483f9afa4cfef0dc51edeb725b662a49427781e3e66a4b4aff693784e36b030fc WHIRLPOOL 46c229d13ecb01d8295821a98a36485c5e2546c4bf3741745e176d163d60ce2efab84a526a6cde644612e4fd19a454136d1d80794d85523f5625b15c9f58906b
 DIST vector-algorithms-0.6.0.4.tar.gz 20455 SHA256 5b8922154baa62c9239ed3efed94e890eeaf7e56f89d81a8c8407550749bc025 SHA512 5e99a77771831f0b9a4485f48aa7be5f5928e811512f0a68e18fa65ecace185dfea74ec09037b05d56e1a9208d2cdbcfed94ce2678d504f6d12267496a3616bf WHIRLPOOL f2e9d2abb74a0565d0a83b6384b7efb343ba485a7dd2ce97c7d5256800e441045fa5a6b456ce22fa99620a30f6edde54d7a5e66663c80ed9d9bb40a86f521dde
+DIST vector-algorithms-0.7.0.1.tar.gz 25435 SHA256 ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070 SHA512 1ea718eeb062defee830fa7dba323981678691c5d320b8929dcd695af17f82d65007cfd35103310026dab51cf10462dbead09082fc0ba5ddd0c2e18e305c4c6a WHIRLPOOL eec4273551ae162b628e85378b4cdd252501e9ced416e16fcce59ce09ce490dc43649f9918237b438d33e12e962fd2cd6e79179a8e9243d6a3618bf19a32ff91
 DIST vector-algorithms-0.7.tar.gz 25427 SHA256 9dfded48c97f4ff765b18ae5acd264361e1299736111ac73895848d8f6ab56c6 SHA512 f68818611d1688487303811a865f7bb2be6d0e66b5f68202418799f08f4018a07dc0a337771bca32b0a40acdcfb06e885d491a7cdb7f5f5ae7b150a58f73a2b1 WHIRLPOOL 8cec1088fd96f7c43109551be96fbd099fe3b33b809f84e3a9fa5eee1fb01fcff5ae17d398b0b5a884033bfb812d8ea65ba69656c595790bb53c2e1527bd85fc
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild
new file mode 100644
index 000000000000..9eda6e40e404
--- /dev/null
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient algorithms for vector arrays"
+HOMEPAGE="http://code.haskell.org/~dolio/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bench +boundschecks internalchecks +properties unsafechecks"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	dev-haskell/mwc-random:=[profile?]
+	>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
+	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( properties? ( >=dev-haskell/quickcheck-2 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bench bench) \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		$(cabal_flag properties properties) \
+		$(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/vector-instances/Manifest b/dev-haskell/vector-instances/Manifest
index 3f88575c2f30..4b6970973328 100644
--- a/dev-haskell/vector-instances/Manifest
+++ b/dev-haskell/vector-instances/Manifest
@@ -1,2 +1,3 @@
 DIST vector-instances-3.3.0.1.tar.gz 3623 SHA256 84b19901a496ffbba0115296452abc49e5248b4d55b153ba62bdf08bb6ddefda SHA512 5be54747af266f47c405884a581bc48f9a66d999634ad6ea1ac12307c0fb77891a0d089b3fce2fc4d85557aa31346a968bb80a583d3e5165deea3dbaf492bb16 WHIRLPOOL a30f32856b35663b4b13fbac44a57e4b861ee93a006af4258d9d6b24a118cb2a443a3236c5e86884f3b9ea68f3038eb0fc9ed787070aa7c2f617e756454fc652
+DIST vector-instances-3.3.1.tar.gz 3726 SHA256 68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59 SHA512 0416532a83ee6f750e51296f1c8a3cf1f374a316bbc30638501e663199434fca28f85064660a9fc0bdbfb08ff5919c0ba1662dba704ff50bd8a7bd1ce09d56ae WHIRLPOOL d99a31a2207ba67ed2ed5dfbc9a2f62c07a8482aaa0fdd783e3ba24798d3a8f82b34768406c3bf32d797758f89939f894092e0e99c70d405fcc7abef44235adc
 DIST vector-instances-3.3.tar.gz 3596 SHA256 bee0ea0636363ddd20324deb9929e3edc5058df5c4b71d10d4aeb11dc54d3c46 SHA512 287437e23c6c8a74f539e944fcb53553cd94767b4f2d16d45c43465ff5e962e7b5dadb3cca2d6ea421a34c6ea8723e160d3d7cbcfc0aae4c8efb6c91be46b5d3 WHIRLPOOL b42f6fb3661f3093ceac0314e51f022913333c40e0ccea68c3d7940edeae4111f51938cdb5979d83b1362a10fb1b92875bec4f622d57fd48d199408227fc6f4f
diff --git a/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild b/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild
new file mode 100644
index 000000000000..4fd6da0cf3f9
--- /dev/null
+++ b/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan Instances for 'Data.Vector'"
+HOMEPAGE="https://github.com/ekmett/vector-instances"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/comonad-3:=[profile?]
+	>=dev-haskell/keys-3:=[profile?]
+	>=dev-haskell/pointed-3:=[profile?]
+	>=dev-haskell/semigroupoids-3:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/vector-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
index 6d8f71ddf5f2..52ba527f2c83 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1,2 +1,3 @@
 DIST vector-th-unbox-0.2.1.0.tar.gz 4362 SHA256 30dfe03ef275d327006396c2de14a625acb067596156e48748756e388cec1e65 SHA512 6ae1fde21a671d4a51a48b30f0726729fad72ce8a356edfe7e42a44701991f802e7729257c3acb39cd245df9b35bb60fcab6350d4001c12baba29e40e82f1b50 WHIRLPOOL ac6157d202d1b74b9d82ad988b1f53549416014e15b99bece056308f65278fc8e4a8affe982f6dde82a4b88475f144f7862c57734b0086eb5dca732171d724e1
 DIST vector-th-unbox-0.2.1.2.tar.gz 4536 SHA256 0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05 SHA512 30c3ff686179d9d9736038e6746d4778160dfc778497467fe7c85baadbb44aa5161550c21007d7fbb1977a7231c3eb5281b8c4c7248e71e925a60588c95debbb WHIRLPOOL e2565df415c2f1405744323cd19aa986a5f24798916a709a970ed9104e35428705c05b955b12c8ade4d5c10041b10b30b861c0998db715159f3cf29e921452cf
+DIST vector-th-unbox-0.2.1.3.tar.gz 4585 SHA256 33db750d3d867f23d0406a7165952b030831ed610b06ef777cfae8439b382689 SHA512 187d23b84387c14a45aa97e196d51d1e171dea2a93b400023db552a8fdfb2d9c5ba4c3cb3589ee73abe612e63b4889851fac889d3b6cd0216dd2d853c24d57ba WHIRLPOOL 8ef4793b3c192c03d307b96bc69ccb9cb3a0a7ed900221096b426cebc571c13b00de86318e5d8035a89aba3b194b0d233b3935383374f067c6c54f451a6b2030
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild
new file mode 100644
index 000000000000..48ab575faad7
--- /dev/null
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
+HOMEPAGE="http://hackage.haskell.org/package/vector-th-unbox"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/data-default )
+"
diff --git a/dev-haskell/void/Manifest b/dev-haskell/void/Manifest
index bd57d1cde9bc..461c340f3e9b 100644
--- a/dev-haskell/void/Manifest
+++ b/dev-haskell/void/Manifest
@@ -1,3 +1,4 @@
 DIST void-0.6.1.tar.gz 3807 SHA256 82ec2a7edf3fa52eba2ed4821306859a75186e6df2a564943e9f9d758205ea26 SHA512 9158e201547b43e97d13112d87ab27b7dddff90fff11727c880bbd03e50faf2755ff27c03710e7bd634325a2c31f07e70dae61e62d925fa1f31b0b66e3927c48 WHIRLPOOL cc0baf77fe42c7f4c9c15e3513d573d5e0107bccb0b95facaae8c9b65f7af78f51d02d5ccdafe98bdbdba68e8632afe56f9113b4359db5a72e8b125928385376
 DIST void-0.6.tar.gz 3795 SHA256 3668a66ec838465c78b1fe4c6fff0080aeed5b232e4854894a4d5c868f922d3c SHA512 cba9dd795a0544db307f68d63615857a4024adc80fed164adccc5d10fa09af64ecda899535ebbe32c987028235e0cf1f88834a0b7066dce401045a0e7facd68b WHIRLPOOL 4ddab2af42b4cdd6ff6ab70c8e9ec7a51b0ab49999a46d1c02c3405f55d787389ea89e124bae097013d122713b1b4ef15cb1499c04c3e8800fb1dc11d635ba54
+DIST void-0.7.1.tar.gz 4103 SHA256 c9f0fd93680c029abb9654b5464be260652829961b18b7046f96a0df95e825f4 SHA512 15cffa3ad31f365ffd276d962ba6c401907d5f4d74deb0b2635a8dc9b516519961c7b5d44751a816cc3480d12bd84be4a81b05703e31d4e796a58c4205e4785c WHIRLPOOL 5f9e28f3c371eff19a1c4e0539b4aa154aa3497a303c471e5620eb46e7d43b2a4b43cb86908aa11d19b164ffc70d8dbf7175ca33f620160e27843bafc33d017d
 DIST void-0.7.tar.gz 3900 SHA256 981b85d19bb51c1ac60103b184b86061621e0b016d4db24dd965751b2bc96f47 SHA512 756d35f9bdf0baa9ab383e16d88533f6e6a71defbf9db5ad202cb18d92c4f32cd9c11eb78a5c8648bfeaad14d9e9bb40c5731e030c7b2a4e9f174b66a2db7a8e WHIRLPOOL a9ea00594ee2bc3dd2d548ce7e994f58761a214e8989655463fa847eda0b567df1bae57fa34be0478619e28b722d916a43148aa9576adbd2784f7f2e8f9babb4
diff --git a/dev-haskell/void/void-0.7.1.ebuild b/dev-haskell/void/void-0.7.1.ebuild
new file mode 100644
index 000000000000..3f59c64e765b
--- /dev/null
+++ b/dev-haskell/void/void-0.7.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Haskell 98 logically uninhabited data type"
+HOMEPAGE="https://github.com/ekmett/void"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="safe"
+
+RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
+	>=dev-haskell/semigroups-0.8.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag safe safe)
+}
diff --git a/dev-haskell/wai-app-static/Manifest b/dev-haskell/wai-app-static/Manifest
index aed8b7f36708..5de599be094f 100644
--- a/dev-haskell/wai-app-static/Manifest
+++ b/dev-haskell/wai-app-static/Manifest
@@ -6,3 +6,4 @@ DIST wai-app-static-3.0.0.5.tar.gz 21192 SHA256 942f3407bea881e92c4db8742a7f724d
 DIST wai-app-static-3.0.0.tar.gz 20720 SHA256 631cca083081803a81cf46d1b538f7c2dbe9c8310b94694a88220242f415f984 SHA512 2e5490266c858d5e08ee3a06677d67ba90444a28f6f1c85ef2e402ea2635a13a2024c84b84d47753d6bcab4ed90e48ba1e67ae5e5a0e60651dedb49c74441661 WHIRLPOOL ccb2ded67213dc9ced39cbcddc019e2cc0b815af7a1aa637e51faf9b6e76e7d7ffbd88cdbed1aa70df4ca3b5a855ad56aec57ab969d03569cc6e20a2e2e36c09
 DIST wai-app-static-3.0.1.tar.gz 21502 SHA256 5361898308ca423587f972aa6e4d91de6652e92ef15a1084543d2696ea845f30 SHA512 851c6c3d13d01dda0566c6c98364ddcc54b8aedb4775e9e491452ea672f3f8dfb05ee75d9c44e78a5c89944ab10f8b6646f3dc9d6bfe44e9f2abd910bb33f687 WHIRLPOOL 96d560a016fa4a8d7a539ad078faba6af1610603774013050db2545750fc3da5ed9ced4cebf4bba11de651769be31bad1b48f7a010e033779246b0dde190095c
 DIST wai-app-static-3.1.1.tar.gz 21781 SHA256 5b7ed5028584bbefbbf3da6869ad9fe5ed4fe28ad599ca5d9ad715a1cee43e2a SHA512 b38b356584e46d2bc04250e6b10b3a4738e308606c0a79260bda967824c6b6ec768a7ed31259c1d8c93eefb5aa264f58a40ebc504aa7385a3702724d68e12cbc WHIRLPOOL 02f177c3a1819b68073ab192a1df55bce63702f6d6428778df08003f18667dab88e4d3e711c5de4b383f4b405bac82708e85974b01a89b8886b2c5eca3e665e0
+DIST wai-app-static-3.1.4.1.tar.gz 22321 SHA256 7280e15192be2d80b2505da152ea828c448e1466401fc4a02e87052ce3515bd4 SHA512 2a4925a48a09ca1d7e366a1b01961b0069c941f0987721e92cb0c257df8feefe78f0dc5f8c69680d155a3d1b1bdee95f4417fe734c14e02b0596475bead72b8f WHIRLPOOL cf6f95727507fb71efe4bf7345ad1a757da89376569b13c05bceabfbe15eafceb6b83b5ed38cbda8fa70229a637945407e80b69d01984272c833298b05f827fe
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild
new file mode 100644
index 000000000000..69af1432ea97
--- /dev/null
+++ b/dev-haskell/wai-app-static/wai-app-static-3.1.4.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="WAI application for static serving"
+HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="print"
+
+RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	>=dev-haskell/cryptohash-0.11:=[profile?]
+	dev-haskell/cryptohash-conduit:=[profile?]
+	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
+	dev-haskell/http-date:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
+	>=dev-haskell/optparse-applicative-0.7:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
+	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/network
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag print print)
+}
diff --git a/dev-haskell/wai-conduit/Manifest b/dev-haskell/wai-conduit/Manifest
index f40315b1fa5a..f07b2403695a 100644
--- a/dev-haskell/wai-conduit/Manifest
+++ b/dev-haskell/wai-conduit/Manifest
@@ -1,3 +1,4 @@
 DIST wai-conduit-3.0.0.1.tar.gz 1979 SHA256 d543f85df31a2d493d2eac3c43fb658e33f2484b4b5de2d738687d7a4d76b554 SHA512 6e32fcd54e729b14b7a1183b0e340d69d44756a655264193439c1c4e7979f7fdc51cfe0ae5de2434f9805dad210a0779ff8ac93d812f5e74ab72a40b98ff3528 WHIRLPOOL b94207a945e54c578c9224c0a6f83e02b0df4b484bf40d9c056fd52fe3211395a88fd3d1aff16ffa6b42a1c73a17a089f878bf8553d762bf1f062a15df6dfd23
 DIST wai-conduit-3.0.0.2.tar.gz 2139 SHA256 47d2882f3f95edf32cdde9db9c663dcc0bdcee3efd605a673c1f3e80e34216f3 SHA512 2b24acf1148b157375dd9f70a15f07b1fb24e76b8cdaa0e67abc47bf8f181d41ae326beb05c769698bbaff0cedb3211f6c148c323f3ff0e35745a5f05198ae1b WHIRLPOOL 67fafe08c19d04ab40c883ad855dfeb44c0d26407abe724451c01f73a820ee23e0cb9af8df4c55db434ef715cc474c1661c05ff2cd369a50e3894082571ed0c5
+DIST wai-conduit-3.0.0.3.tar.gz 2129 SHA256 e49720a7c7b58e78a56991e42fa550a722936af274dc27755a735781258f7aff SHA512 adf6c507f53dfd5eab33cc713528d27fd37d044262024626e89da1489d9315e2fbd47a1a3fb00384858a79101482cf056349e17a0614e6788613e67bad1ff976 WHIRLPOOL 0cf02491a2515dc0ee0d4b824d333b1cf744ceff2f5c2c04383c3234cc03843eb29d425311022fef6105b80b957d9e6e4e8f9388c57e2731ea02be4d7e936fa9
 DIST wai-conduit-3.0.0.tar.gz 1987 SHA256 af690912fb471a8a4a59c75b83d256d60c00cc78f3f80f87f407bf38bb97226d SHA512 9dc576ab1276cc4d45bdb709f54f7f24e8d445602f65863f5377e3707debe79352c3aeb4a9b61335feaed30b1b531eb3df23f326b43f2592230e7c65fb223b50 WHIRLPOOL d4ee9a2af8f7fa2655e3abc63e8790f43c10be5215f85fbec5069438c49d1f18f189b53b73e9ebe855769f803f98393f2087539ca292a3c657ee3c4a18e1e45a
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
new file mode 100644
index 000000000000..c8f0b37259e5
--- /dev/null
+++ b/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="conduit wrappers for WAI"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/blaze-builder:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
index 590d7ba32db9..92cbfd857246 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -3,6 +3,7 @@ DIST wai-extra-2.0.0.1.tar.gz 33201 SHA256 1d8b0e6a9afe2e80a320ebfbbf559d66fad6e
 DIST wai-extra-2.1.0.tar.gz 34920 SHA256 cce8de0afd0fbfd9a73397163abe3a91f834a850da84e2d3795ea2120d0b5291 SHA512 ea69d912ad4d64c7f0a68146c21f10a30c330475bb3d5e555df220f2c954d1c5e50db0fcc63d4f6a0c245cb1de022c42db93161d9c3f91629183aece95dba546 WHIRLPOOL c13a33a6ab3c86cf9f80e7ac26e54ad9012a798c0a7b5ce4e235bade8585c479574ebd9f5744ab049535e9eed4f846c5c4bad02cf9e51bc1af527b46bbec1a9c
 DIST wai-extra-3.0.0.1.tar.gz 39143 SHA256 4fefb5b191cbb952df9d414c6c991a78fe0378bb6ad24ed29bda89cfef684844 SHA512 88f4db8814fa8184a1c9e0c591dff49d8716115c4fc91b230331affba9025cab75be2044135dc1620da807e242af20e109028a076870b38fdccbd0cde6dfc498 WHIRLPOOL 7f354be1d880807d3ea10caa6843732498fd7af29b485d57862841116652f03d7bbc8aed117d7d9f56131a12278374fe2f1ed375055079d920b8488aedfe530a
 DIST wai-extra-3.0.10.tar.gz 49846 SHA256 503af31217c29d1bcec10a6806ea119aab9d68f29f12a1c1006fe4f931771b37 SHA512 c634c02d5c5b7774fede0b639be6cce7522e74cfb5eab4b5e5bcca3d00dd6304bb1d2a83a8bfa34e29c5dd3b72802bfc1306d323bd98629e530b0b630e0b00e3 WHIRLPOOL 0d0331670a3aa5e2e04e1d8bb79ed1240070954ad565e9569d6d9bb4a6455a0616990167335857f4975b2ec34dc53e1184910f82b67b97da7384d0619ad72e22
+DIST wai-extra-3.0.14.tar.gz 52041 SHA256 63f0df82dcd7c871c458e1ee67aca6d48b8794ff474e6b5e93873d4bbf6f7f2c SHA512 92c8456cc2959ddfd23bfae50936f237bfe903143d68ef211e2af8dbe1327a8ede63cadd74d3555349411a5046df9a2c87c7e983e06728759eafde80092a8aea WHIRLPOOL 28bf71e0987bc3a098d0d1bc2e94a2cb6ab50fd8bf8d6256cd99b2b9b390613e0e5db610b13f9fa4b5ef5495112e858efd3ed5ecdca33418be3ec45fcf458ff0
 DIST wai-extra-3.0.3.1.tar.gz 39902 SHA256 7691e8a7db56fc0cec98b7f5f9aeb87eec31b842cd528205547acece3af6e833 SHA512 9f4fd9364a98be471805c915b0487c6b11d6fcbd990df8a7e03c71f35542541a91cd78cdab40e13496c9445b2bfdd3e52029de4c45e5e8cd4c573bc66f61f60a WHIRLPOOL 99a2de35976aa209188ab7f7f8b96b0c94f3c268ff4f428d2f4278f8cc6a3e6d275ff2ded372f47e56bdd68a752999508d68f16db0140d6a1be7138553faf2af
 DIST wai-extra-3.0.3.tar.gz 39857 SHA256 439c0559e875efb2b7998842a64f59974aeeadecd58c496a47e90540d71f97b0 SHA512 cbd48d1ad45ea08a4eb6e2ba9cca759957bc01b1a0ffdc8004fac607c61211c7e49ea40bb27a060b8fc4fe02765db7dadd0cf02c38dd5550a27cd366c136b0c9 WHIRLPOOL 526cacd33d1be0315bc60f33f1c819856c8dd4d2080cf9edc1105ff383525a3cbae33c4cf8d92246a7d6e8b747f2a2d9a026c0665922ccf10626311fafec52ff
 DIST wai-extra-3.0.6.1.tar.gz 44174 SHA256 aec46505f7603e9624efcc50d324d16955c14f3b3bcf5f201ff820177cca9d97 SHA512 c006d3f02abda652d444e61f726d5cb03815fe7fda53ce728786b3b8de7df1aecda3351aa6813512b4f5b3acacacf7971fa982e24df0538458b1dbd343110bc2 WHIRLPOOL 9eefba11c450239056fda76ff159002ccbcf238f7bd22cd5c4b3a59b5935b5cbabbf26aced3288e17b374465735f38b83e58c775fd45da8664bb7c7efb31314e
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild
new file mode 100644
index 000000000000..cbc5b5c96f5d
--- /dev/null
+++ b/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Provides some basic WAI handlers and middleware"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/ansi-terminal:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/iproute:=[profile?]
+	>=dev-haskell/lifted-base-0.1.2:=[profile?]
+	>=dev-haskell/network-2.6.1.0:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/vault:=[profile?]
+	>=dev-haskell/void-0.5:=[profile?]
+	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?]
+	dev-haskell/word8:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/wai-logger/Manifest b/dev-haskell/wai-logger/Manifest
index fad5427c2790..00f416024890 100644
--- a/dev-haskell/wai-logger/Manifest
+++ b/dev-haskell/wai-logger/Manifest
@@ -4,3 +4,4 @@ DIST wai-logger-2.1.1.tar.gz 6126 SHA256 488ea39e8e7db2df353f47065c6a40063e18555
 DIST wai-logger-2.2.3.tar.gz 6560 SHA256 1c74063036301219614d9b596ccdd3af52436693c9c84d9febe347e707fe5752 SHA512 fd6bcd2fdf1e804f96c4debfd40a084b13fb0a00762a9b1cc262e7c263d3727c86e43588d79f82c99d20e31da4469a6e1c0c85d14e4bb5fe353fb97881de4986 WHIRLPOOL fa4e7e1c74d289930735d636f290e905bc18eee8149ec6622a51773e422ba9d35e8d93fbf48cac7db51476256b414989baf5e14f46889365bc988e27dab99725
 DIST wai-logger-2.2.4.1.tar.gz 6585 SHA256 f37d6bb6ea4a5f881ab2c9df571c923c5624cc83882b19640b924436fcdedae8 SHA512 0900ecbcebed9433541ae4665c98037f1da832d6e6659be81328433f3ba9a5f258059736205e36517fdc22aefbd2d85e79bb5b50296c257b964c9256b2e828c5 WHIRLPOOL 7d3a5bc6359b4edd5ef899a742bc984d3116d7a56ad3b9583818cacd8ce41da75189ed513cdedfdee0502673d51f57f92b467b1870424b75ec35766485d5da41
 DIST wai-logger-2.2.4.tar.gz 6600 SHA256 7bb519741664eb2d41582f712fb2066270ea309813ae755ab930d8cfdc68f250 SHA512 cc761517e46e5363b800b5bbadcc662c6917b7f023a3248379a9ebb58a09f5ef31dcefb2df6270df64bc6b4b2f8e3b021d875d3f9aad0fb06d8d14a7d4dd54e7 WHIRLPOOL b235fb8ee0dd28085ce92b99dd346f00a6b07a7df449a1a48ba21139835b123ca3ccc9433a083adf26d1dcead18ba4ee7ef1914d806c799fc348f3d5e7289a26
+DIST wai-logger-2.2.5.tar.gz 6566 SHA256 678e6fa92d2a8c71182b96e809c69cca4558ddd132ec41bdcf786cf5f1800ba3 SHA512 7300260f4d3f0dda065a7a26c579329dea2d5314ce26e969eb7e62fb0afcbbf3b097b52e703ec1ddb000481a60df0b567ad3f6dab204c5178be6e16cebf522ea WHIRLPOOL 76a9cd9b1204233b73b9dcff9f4dab7d7df43c073d4150761aa821f64de5863f12f9d0dbd003ceacde941e77043fde7c8dbf7bb82bc14c9d7399ea2c9bf9f632
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.5.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.5.ebuild
new file mode 100644
index 000000000000..09c3c211a45f
--- /dev/null
+++ b/dev-haskell/wai-logger/wai-logger-2.2.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A logging system for WAI"
+HOMEPAGE="http://hackage.haskell.org/package/wai-logger"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # wai-test cyclic depend
+
+RDEPEND="dev-haskell/auto-update:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	dev-haskell/byteorder:=[profile?]
+	dev-haskell/case-insensitive:=[profile?]
+	>=dev-haskell/easy-file-0.2:=[profile?]
+	>=dev-haskell/fast-logger-2.2:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-haskell/unix-time-0.2.2:=[profile?]
+	>=dev-haskell/wai-2.0.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/doctest-0.10.1 )
+"
diff --git a/dev-haskell/wai/Manifest b/dev-haskell/wai/Manifest
index 86b07fd65812..b43421256c0e 100644
--- a/dev-haskell/wai/Manifest
+++ b/dev-haskell/wai/Manifest
@@ -7,3 +7,4 @@ DIST wai-3.0.2.1.tar.gz 8946 SHA256 2930db958626f1316b01724904149ad7876d2f5b952a
 DIST wai-3.0.2.3.tar.gz 9285 SHA256 da22c07a204c0dbe4cfdf528edcf833cb318f583b38c9a0c14edc91e44f039d7 SHA512 67b8706789c8f3af8defb102f4224a6dd62f1329436dbeb3674d79ecd877d58eac623d41334a12577f0c1845e15d4ae4be70e5914dc79fea3e92f296201ec05f WHIRLPOOL 1522a5ff4d0a2d56b7506c3c99e9bc337dcf8339173a2349441efbaa8cfc1bdc164b668fcae5d02c623dd1ea05fa7dd5c9e0fca38c4863b546d9b81edc8cb92c
 DIST wai-3.0.2.tar.gz 7892 SHA256 fcb536879480b09c176e46d48c97e249d21ae67bffdbaa3097dbb402f2f7c74c SHA512 d7ea9eff649a13dc496feba433410b3abbe82da0c839ce5f4add02f015882cb1bb15340189811c19147c9eb985677fd5838f47b183242f423af6d7cd4139490e WHIRLPOOL c4ddea0514e45f9df4840e69930b4feac34d9ae6b009d0804ee8c6b6947f9ac64b4d677dea18fcd28fdd222469436ce248e8159f73a94d9d98cfd664d470cbd1
 DIST wai-3.0.3.0.tar.gz 9532 SHA256 c47eb435a3320795f21bee8585abc8164aaf3bfde86f7e1e13e98190cb968d10 SHA512 e1a3672db5ad367abdafe88b8366f29c8cc4dc5ef309b09193a2167d90466cdfed19fcb5ba4e179b31622c3df8ddb74a11c5338967fdae8696fb739cf62a7002 WHIRLPOOL 82c88817898995ea326c267ab91e6e5d47d5d6554899167cc3891fc23d3d258ed240070d90aa142e4e70eee06c05857f6a67c3032a69fa5d50e7b9d2d38d46cd
+DIST wai-3.0.5.0.tar.gz 14498 SHA256 0e417e6e8eff087585c0079917e6141a4e006fcd6cb736d1c6b49c503e9a08f3 SHA512 076ebc3a651b5e93e608d42a9a64a591bfc742139dc6112ce574ef04b4e701d709bc3fed2ed7ce74ca46f9e99df45990a0b8bfe7da0b054c06f0bc7864b29fc7 WHIRLPOOL d3ca8f86f9f140686a0e1d0f8dbe40915a6bcdbfaf871fc549e25755dcf6403293fd82d221cd6dcaa75703099bd419df3df18c5c7491d07bfe0b7afd0090fcc2
diff --git a/dev-haskell/wai/wai-3.0.5.0.ebuild b/dev-haskell/wai/wai-3.0.5.0.ebuild
new file mode 100644
index 000000000000..b7f2e31fcab4
--- /dev/null
+++ b/dev-haskell/wai/wai-3.0.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web Application Interface"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.10.7:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/network-2.2.1.5:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/transformers-0.0:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch
new file mode 100644
index 000000000000..38889be35d39
--- /dev/null
+++ b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch
@@ -0,0 +1,25 @@
+diff --git a/src/HaskellNames.hs b/src/HaskellNames.hs
+index 6e1910e..bd61137 100644
+--- a/src/HaskellNames.hs
++++ b/src/HaskellNames.hs
+@@ -147,6 +147,7 @@ isBuiltin name
+ {-----------------------------------------------------------------------------------------
+  Haddock prologue
+ -----------------------------------------------------------------------------------------}
++getPrologue :: [Char] -> [Char] -> [Char] -> [String] -> IO [String]
+ getPrologue moduleName content contains inputFiles
+   = do time <- getCurrentTime
+        return (prologue time)
+diff --git a/wxdirect.cabal b/wxdirect.cabal
+index 83be4af..02b56af 100644
+--- a/wxdirect.cabal
++++ b/wxdirect.cabal
+@@ -61,7 +61,7 @@ executable wxdirect-2.8
+ 
+   build-depends:
+     parsec     >= 2.1.0 && < 4,
+-    time       >= 1.0   && < 1.5,
++    time       >= 1.0,
+     strict     >= 0.3   && < 1.0,
+     directory  >= 1.0   && < 2.0
+ 
diff --git a/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild b/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild
index 9ef5ed2755f9..116f193fdc99 100644
--- a/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild
+++ b/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8.0.2
 "
 
-PATCHES=("${FILESDIR}/${PN}-0.13.1.3-ghc-7.6.patch")
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.1.3-ghc-7.6.patch
+	"${FILESDIR}"/${PN}-0.13.1.3-ghc-7.10.patch
+)
 
 src_prepare() {
 	base_src_prepare
diff --git a/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild b/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild
index 5dfb9b3d514e..74e259d0e503 100644
--- a/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild
+++ b/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,5 +36,7 @@ src_prepare() {
 		-i "${S}/${PN}.cabal" \
 		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
 	cabal_chdeps \
-		'process    >= 1.1   && < 1.2' 'process    >= 1.1'
+		'process    >= 1.1   && < 1.2' 'process    >= 1.1' \
+		'time       >= 1.0   && < 1.5' 'time       >= 1.0' \
+		'filepath   <  1.4' 'filepath'
 }
diff --git a/dev-haskell/wxhaskell/files/wxhaskell-0.13.2.3-ghc-7.10.patch b/dev-haskell/wxhaskell/files/wxhaskell-0.13.2.3-ghc-7.10.patch
new file mode 100644
index 000000000000..0d137416994d
--- /dev/null
+++ b/dev-haskell/wxhaskell/files/wxhaskell-0.13.2.3-ghc-7.10.patch
@@ -0,0 +1,8 @@
+diff --git a/src/Graphics/UI/WX/Window.hs b/src/Graphics/UI/WX/Window.hs
+index 0b04fa9..39c0505 100644
+--- a/src/Graphics/UI/WX/Window.hs
++++ b/src/Graphics/UI/WX/Window.hs
+@@ -1,2 +1,2 @@
+-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
++{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, FlexibleContexts #-}
+ --------------------------------------------------------------------------------
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild
index 56a388d21716..491be5e431ec 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.13.2.3-ghc-7.10.patch
+}
+
 src_configure() {
 	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
 	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild
index 0ce4f06b3445..0b28b638bbdb 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.13.2.3-ghc-7.10.patch
+}
+
 src_configure() {
 	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
 	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
index 87090ac4cb4c..d32fe1e5de35 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
@@ -22,4 +22,4 @@ RDEPEND=">=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6"
 
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4 7.10.0.20141222 7.10.0.20150123 PM:7.10.1_rc3 PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1"
+CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4 7.10.0.20141222 7.10.0.20150123 PM:7.10.1_rc3 PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3 PM:8.0.1_rc1"
diff --git a/dev-haskell/xml-conduit/Manifest b/dev-haskell/xml-conduit/Manifest
index 003ef80a3fbc..45f66b534db9 100644
--- a/dev-haskell/xml-conduit/Manifest
+++ b/dev-haskell/xml-conduit/Manifest
@@ -1,3 +1,4 @@
 DIST xml-conduit-1.1.0.9.tar.gz 29805 SHA256 46f759c3657da413bc6941cd0c7d23744bbe1d8b669a7fa26f60db4997475d07 SHA512 94c3f925e3ace90c1434b0becdf1a6fa73db786d71522ea413bcf40fab653f415c4e7b8653ed423ca9f24665e4b8af92661aa436824c4a1dfb7d249702bf079e WHIRLPOOL f05299b94b588c010e9cae5a89097f52d7005f98e523e3d289f3a3fe8122886279570e3b0fdcf1a811b0a1953b83e6731a13543412c78efc32f1d65255e49700
 DIST xml-conduit-1.2.3.3.tar.gz 31240 SHA256 0bc599d6473f9c19c1f2c0f598799c586cf03c96fc21c8107d856ea20c15b378 SHA512 1a72b890ad3501d8a80a4030a01da35ef913f9245db9c870f13b5d266e073f14d490d38666c639575e5cf9a28c19e27378ffda9d4fe551b2b187f9e98167bd69 WHIRLPOOL 300217472c6acdbcb167d4d90337aae7bc915e3584542e8b277f72f4c811779e4bab273975f356c3affe65d2d076108be420dc21b276b6ee6f89d223e7ee8c35
 DIST xml-conduit-1.3.1.tar.gz 33304 SHA256 19e65bb1753f99c8a9f2011f2088639db3b8c06f72d29fea1464f623879b8f24 SHA512 939a891304647a8643bbf186269edb3a59930bf825dfa9e5f96382259ecc1c0787fbeb826ba0e5ec2105b263c8a639fc6079e8e3918b271f0e6ab9640133d1a5 WHIRLPOOL 176421a8ed579893f9bb8e5f649076fca1e06f42249db06626e73bc8213086442a6c977244f1dbbfc15c9d581ea5e90c4a45f54216cf5aa5608a3816af5a76a8
+DIST xml-conduit-1.3.3.tar.gz 33965 SHA256 300a0b5eb2ff1062012b61bc4aaa390571daecc671af2d8567a649489b08b66b SHA512 1be43bafbdd3e0b0ca778741a42d81e95ee4f02f38dd61b06fd371f1314ff809223d0a6a269124191df8887ab82a85ff280d3a95d82c37038b04e86da12ee2b2 WHIRLPOOL 69573441cf87d9a23d8c466a350500ab75ee8c466e4d9d41cb7ddb15f1251ac3afdfc674d0dbd00903f8590b4902cca4f3e8c896e44cc182eebd248e3e01979e
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild
new file mode 100644
index 000000000000..073237963fa7
--- /dev/null
+++ b/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
+HOMEPAGE="https://github.com/snoyberg/xml"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5:=[profile?]
+	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/conduit-extra-1.1:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index 9a3af76fd4d8..f6a41facf79e 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,4 +1,5 @@
 DIST yaml-0.8.10.1.tar.gz 73448 SHA256 e977912762e13571ec596173405ce328c8f7397aee4dd21f61ac9af762431ba9 SHA512 59b26eaca99379ff84cda6b8972ec2ff1e777536a754b9bda248d350a0797ef6c24d9cb86590062f4e6c12a5453224619a656c306a0292fdd1fe46e459a286e7 WHIRLPOOL 1a6f46577db2ae119bff0d31f9f541c3f272ab052f16d17e399e274651ef480d840d72730e517b022b5309bf467dc63ab697ae2dc69a879d5073b214403524e5
 DIST yaml-0.8.11.tar.gz 73566 SHA256 3b9c70c1cd01f0d232b594703e940268575d5656194533c8b46f28c64d5259a1 SHA512 fb77bb51c80a3c84c245b1d4d28539b981afe66f861d7f9df4b6e2809cf0f172b88bdde876f08b5747d141e8489a5e425c9b5e5374d5e35d4d986d44ec7c20c4 WHIRLPOOL a8fa1966b19bf7e7bb3689424b6ffa563600cbdc15d9220e48c73bd464721d5e585a989307dfa91c2e4757100ce1a4cd6a24f4af7e14c407f82cc0247ac1f99b
 DIST yaml-0.8.12.tar.gz 73595 SHA256 311df4961499b7ea4899c787a1e64efff70f1a6cb2e00fb15c626b806c60b75a SHA512 d1ae9b27379cdbb028094983fdc6ca7c96a27fc223ab74b9867c7f69a795118bea78d30dfddfb043f6281339d7691bda3466329a114436faf806fb7d6331681a WHIRLPOOL e82b759748b738b2ffc0bfa27b43e534f1e38cfacd2301a8890795b529e979fd37d71b6f20f41325208ed24b58eb4f5d945f025986a18349549e98cd1cb6b0ad
+DIST yaml-0.8.15.2.tar.gz 75540 SHA256 ec5e9402e96590842bb77d6b66003a2289b4ab415aeb25362ef8f6c370a32712 SHA512 214a8203ca13350268b285d7049110ce91c03d6c8b0bc59187048b9efed15374c97a4b91e464e86f719d3190c0bc534f9ca4b7436fc33a4748d0fa84bb747bb4 WHIRLPOOL 60f4909df9199c5b45df2a214c03626763874b097725979f5ae342d28071ed9411c9718606c00a24e5d000594f53a734b8f0b8566173faabc09e86f507ef07b4
 DIST yaml-0.8.5.2.tar.gz 67867 SHA256 fbc999b2ee4062e942325037130e058bdaca214bb1f4e71428d7c553da2a48f4 SHA512 4cc0758f49a09f3ce48e96cb791a5cb5db87a5abe67053fbf0959a2eabcfd633a27f117604ec6a166cc23b097eed83bb8f64f92f15561a139c16f365a5c0f5e9 WHIRLPOOL e6d1244c8aad5393cbba7ea27b7ff05ce37a61daeb7d182d4b8f053c6e214fe7d11b365df953d238efe6af1a67e75f90ed2e9ee5b3e00e38525f627157babbd2
diff --git a/dev-haskell/yaml/yaml-0.8.15.2.ebuild b/dev-haskell/yaml/yaml-0.8.15.2.ebuild
new file mode 100644
index 000000000000..9132be8a5448
--- /dev/null
+++ b/dev-haskell/yaml/yaml-0.8.15.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for parsing and rendering YAML documents"
+HOMEPAGE="https://github.com/snoyberg/yaml/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="no-exe no-unicode system-libyaml"
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
+	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/enclosed-exceptions:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/transformers-0.1:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	system-libyaml? ( dev-libs/libyaml )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/aeson-qq
+		dev-haskell/base-compat
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/mockery )
+	system-libyaml? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag no-exe no-exe) \
+		$(cabal_flag no-unicode no-unicode) \
+		$(cabal_flag system-libyaml system-libyaml)
+}
diff --git a/dev-haskell/yesod-auth/Manifest b/dev-haskell/yesod-auth/Manifest
index 5f23a869cbb5..4c060d2745dd 100644
--- a/dev-haskell/yesod-auth/Manifest
+++ b/dev-haskell/yesod-auth/Manifest
@@ -1,5 +1,6 @@
 DIST yesod-auth-1.2.7.tar.gz 29818 SHA256 93574f918075f7de6aebbe331bb8e78c1ef7c5c45b2c693ba83c9f694ffb3a2b SHA512 e2029095d280d0f7c69e06195c864debe17ab4679e05279d31a37823956880d0fa3abdd6c285c08c44ee658948e7174888d682122687a0a022d229ac376e64b5 WHIRLPOOL b52db4f2325508ac7af358ae3e5836dbeb68af362384f45d8ed0baac3f31799fc0c4a61f0e22a0b4c883514bbe378beb4d05a33aaf000b5cf427180e1c0e6beb
 DIST yesod-auth-1.3.1.1.tar.gz 35665 SHA256 390eb48a0e5ee1efc25e258b126b937f18d74a0f5bec79b67d6943fbd0268057 SHA512 daaf65024334a24da78b53dbfa64e78e855d32b29eed1088f43f99d6794c65e4a49541350fdd3d6590ba28e02556888656f185a8aa92bb6b5439635c972dce6e WHIRLPOOL bcf239527ea22ef9ea910286cecaca5290ab897138efc825a8c91aa565e00a848dc6cce3aaa0dc289b432a07a3e197da82e5dc4135ade3cfa204df85d7733dd8
 DIST yesod-auth-1.4.1.1.tar.gz 38398 SHA256 be34c2ab1d45e942ce7c2021bd217642b05eb704411b26f02ce151cbb8c779de SHA512 29c4c5a34180d32fecbf177d655bcbd0f28cd6a1fa272a6124cf7750a4cb87a23c23b28f71fa1b22784c6958e2085bc4a8479456c27587cc562e34c2c4355a81 WHIRLPOOL 621af12e9b2f05cc75ac79bee1a2a8dcdf9775055e130d7c1f7efd46abce54e959126fe44eac4de52175a2724cadaf12f0baa924b14535e1a38892238f1789af
+DIST yesod-auth-1.4.11.tar.gz 46006 SHA256 2bf08ed837a32e98002d5d16c5cd751a6871950e7bcb2e8b12045f6c60071a77 SHA512 32670e5a0a017d8aee45314babcd49e4dab9c7adfb0e03ab1c622bf2f5df414ae9dd27e275da97cf74147188a81ddf5523edb31701ca84289790fb20113fd4be WHIRLPOOL 35381578c07c2fbdf17e5c3e0b81c6c9b17117b0144120a5b551362a46e3247deb0ff86e959334750d1c2260d2ba26038a019a41d32033022505d6364a9cd99a
 DIST yesod-auth-1.4.4.tar.gz 42087 SHA256 082c34d6e57a1f83a88f69a3b5b8bfd025d0c056c19f106eeb1399d724f0361d SHA512 5b127c5157401a2dfb740b43078fa65b985d3341cd32035a323c00a0bc039aa20942205a9534cdb93426a57c930886b339d2c9a2fa8b7c23a55602a0ab81adef WHIRLPOOL d4566cf2167582df806b6f6acf99197513fb19a43b3ab5ee9e2e070f528168670c84db7da88ebc85875dab4e44c627306820d408019b86f3896192226a0c65e1
 DIST yesod-auth-1.4.6.tar.gz 42895 SHA256 5d6c74908daabe5e6d5bdff919d3e8e2bccdf5e599da430135474cbce30d1030 SHA512 3d3abe5dfa1c37412b3222e2d11f332dc20ef12f1f9be4080418f1ac3bdc24ffb98a4df7feef3b3f66c257f14658449459845284f95e360994bd344dd45a1460 WHIRLPOOL 8da7fa1e5fb40207d9348a4d623fa316bf149c66779ffc4fe7c1b23e710cf73eaf0595cdec5b19fec98dc3a4159ef307fd43bc75848aa3777a929726f496c244
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.4.11.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.4.11.ebuild
new file mode 100644
index 000000000000..8049b04b0586
--- /dev/null
+++ b/dev-haskell/yesod-auth/yesod-auth-1.4.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Authentication for Yesod"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/authenticate-1.3:=[profile?]
+	dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/binary:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/cryptohash:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/email-validate-1.0:=[profile?]
+	dev-haskell/file-embed:=[profile?]
+	dev-haskell/http-client:=[profile?]
+	>=dev-haskell/http-conduit-2.1:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	>=dev-haskell/mime-mail-0.3:=[profile?]
+	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
+	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.3:=[profile?]
+	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.2:=[profile?]
+	>=dev-haskell/random-1.0.0.2:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/shakespeare:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-haskell/wai-1.4:=[profile?]
+	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
+	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
+	>=dev-haskell/yesod-persistent-1.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index 4a1d8928cbcd..99940eb7cafb 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1,4 +1,5 @@
 DIST yesod-core-1.2.7.tar.gz 59361 SHA256 16f736c31c0cef1af0e0b6d79de71c6e81497c04442a524421767b781ae877be SHA512 ca29b69db3e9ddcd93928fed78642a8740b8f73c21093cf2116caeceac597a5285f24882e2b5a40cc5ef66343e8c3d160e2d0e7b88459b649abd4b7148e6c400 WHIRLPOOL 08173d1487b96d67171cfd244e3c304fd07d64a2140c4ded7fafe1c63427abf1b67f6ee20f35e786218760c955d792e6f4e19ecd11ab6c0c94ed27201e786c5e
 DIST yesod-core-1.4.12.tar.gz 81087 SHA256 035387453f60a9476ac6646675da147eb4b6859c48393732b72f31841e15b7e9 SHA512 299cc327b4d224ffc577c71ed966a9fca03faf417317c3053e168bf29fcdd852b62a16762714ffc49058efb37ef089b622168fdafad0ea67a89ed066140db504 WHIRLPOOL 1e8fbdf5b1ad4a73e219cd2e7afbc6144e44d43af8f40ddc7096bc52f6d73a304f5b6329abba214a9899e7c43e92e8fb373d36e0c17cbdf88c9dacdab55d68a4
+DIST yesod-core-1.4.18.1.tar.gz 85651 SHA256 8964a1ce27f7d15037eee05611546a8e5e183640115e92e70fc73e1116beddb0 SHA512 9a97f00ed00f4f63be076dc586ca2305f6341816123758086265a0c939ce9e79a1f0b1399175f69a98ea0d40a5419848a81b95e64bda2010ad29b2810c515ed8 WHIRLPOOL cfa1485a2855d14b99ea318ab331c3f5d7566da2d676355ad828ee8db194dbddaa7e1a76ffcaafe435c0e2f7e3b20b978c801b000e69fccd18354033780ca185
 DIST yesod-core-1.4.7.1.tar.gz 79493 SHA256 7b132b21ada1421cadc1c06eae4951115989d006403b82e3ec062d6c75d8f3d2 SHA512 9dc67a4c944ff05dce7e8ffdcd661e645eaac03d8cc8f59f1ec019b25051f24e674ac926ec8907e3681f8383c83a904b3f0042c03f4558adfb1a386a8df109ab WHIRLPOOL 90c629bae2eb62f699433e8317434610eb5897035c250e97dd8691135496777bd67d96796568fe47c1d3dc0c9fc84d498dc4f43681676353bab4a75347e62d82
 DIST yesod-core-1.4.9.1.tar.gz 80635 SHA256 4c1bdc58cf9da8f2242ec74f6f7013516582b9a01751909f0c2563a8985014bb SHA512 66f58243234a42232c9512f9b218c73606e8fdad675a916577a88c63126944e3baedf704212e665c862dabae86a59671e9cf6a23562badbb13595921e587036e WHIRLPOOL 20052247675e0962d45c3255f78b3315ec4fdc8367f683e179612cae06fe45428a75d2646a9cd2203fec53bae4ce8fafb3182e88c4e69637f222ef1430e0217a
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild
new file mode 100644
index 000000000000..f120d75d8681
--- /dev/null
+++ b/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
+	dev-haskell/auto-update:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
+	>=dev-haskell/conduit-1.2:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	>=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/exceptions-0.6:=[profile?]
+	>=dev-haskell/fast-logger-2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/lifted-base-0.1.2:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/mwc-random:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?]
+	>=dev-haskell/wai-extra-3.0.7:=[profile?]
+	>=dev-haskell/wai-logger-0.2:=[profile?]
+	>=dev-haskell/warp-3.0.2:=[profile?]
+	dev-haskell/word8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/async
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hspec-expectations
+		dev-haskell/hunit
+		dev-haskell/network
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		dev-haskell/streaming-commons )
+"
diff --git a/dev-haskell/yesod-form/Manifest b/dev-haskell/yesod-form/Manifest
index bfd7b6ae7bb9..0f660a5ea48e 100644
--- a/dev-haskell/yesod-form/Manifest
+++ b/dev-haskell/yesod-form/Manifest
@@ -1,3 +1,4 @@
 DIST yesod-form-1.3.11.tar.gz 23456 SHA256 c016902a7d914ae1ef41f5af0c1b943c94516931a83595e835c5d6f0b7c78495 SHA512 2876b460a7a3eba940cb6f572f0c37aba6caef3d2e109a357f7275c76638b7a82aad980f9d10846c4ce7f80c6ce8a8964fe37d55008acf5a1e81b54620ba6c1d WHIRLPOOL 5549b849c5d5d1fcf2af3aa367bb6827e8ae7b28554c6a05c9eeff43653ab8895ee17e69f1ed0718ff48627afe940e7b058f07af4d4a246a58f85a61af48100d
 DIST yesod-form-1.4.3.1.tar.gz 29360 SHA256 4be16ec5fb10837dbb19c5db615f99e92919c035462e3de66bbc229348084d90 SHA512 5d6cf93a14f744ec5d6aa1073d00db1a33ca6e40fc059f41ea83dc80301eb728124074b5f1e957e4a635b5c7b9111fa1ad2c79ccca0fcd7a976e5b956523f73e WHIRLPOOL 0d96f03a2157027cfaada65b7e633ed896b07cbf00767b6565883e05d516d6fb211b2f6acf8bac8d8e3af14a5da5172ea37e83d529eebcb80114e49ce7b179a6
 DIST yesod-form-1.4.4.1.tar.gz 29487 SHA256 83aec216b6c5179c373d1b76ab3cca219ebacc98db2e5163400228b632dc6493 SHA512 db7550e7bf42f062c7c96b1dbe08299538d40bc853cc1c24e76ac5c61627ce424530f0a44fe0437c56768fde7645e8193b0bb2cc55cb4da6c13a936be85a829a WHIRLPOOL df581eca165c643d7dcf4790aedb07f861b061c89a7e4f41fd39c822c93a8fc0fbacf0d4ca9a7f1b97d6b36d1c69d8a278912062431827a349d15fd3a129f0d5
+DIST yesod-form-1.4.6.tar.gz 29646 SHA256 1a20f58e0f06b92afc5bd31b5ab6b1d5c6645e2f7fd134c4b2e325d818b50e66 SHA512 fe22f6f3b657640e2cbe8a417f98b2a9e1336676c92b54e83cd9e49013195e95bb98ec7aa383c06d3a2196b2b6bdaec69b647851119138ba81a34dfd84928805 WHIRLPOOL 541f9cbef192d094f17392b62bf29b2a68097c88e4186f65a3870439890c4505b41fb6e0b7a628c890f5c5b8c490a6ce983ba11f05f2e027b2193ddcc4d5ad7c
diff --git a/dev-haskell/yesod-form/yesod-form-1.4.6.ebuild b/dev-haskell/yesod-form/yesod-form-1.4.6.ebuild
new file mode 100644
index 000000000000..36730bd0b8f2
--- /dev/null
+++ b/dev-haskell/yesod-form/yesod-form-1.4.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Form handling support for Yesod Web Framework"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/email-validate-1.0:=[profile?]
+	dev-haskell/persistent:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	>=dev-haskell/text-0.9:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
+	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
+	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild b/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild
new file mode 100644
index 000000000000..a2a4ebf80f76
--- /dev/null
+++ b/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient routing for Yesod"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/path-pieces-0.1:=[profile?]
+	>=dev-haskell/text-0.5:=[profile?]
+	>=dev-haskell/vector-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'path-pieces               >= 0.1      && < 0.2' 'path-pieces               >= 0.1' \
+		'HUnit                     >= 1.2      && < 1.3' 'HUnit                     >= 1.2' \
+		'vector                    >= 0.8      && < 0.11' 'vector                    >= 0.8'
+}
diff --git a/dev-haskell/yesod-static/Manifest b/dev-haskell/yesod-static/Manifest
index 61947995e0a0..e7f7b1f4a699 100644
--- a/dev-haskell/yesod-static/Manifest
+++ b/dev-haskell/yesod-static/Manifest
@@ -1,3 +1,4 @@
 DIST yesod-static-1.2.4.tar.gz 25099 SHA256 3f180018dee2e3dd8c306bebdedfd67a8160e8836adc097765a7c95765f8ab64 SHA512 8879f50028f45194071d588d7ffb29f20b860983546a07a12975b4b8e5279e962060f4c7a794475ea34d35bb061f63a342383f45a20441f34f95e4e553b335a7 WHIRLPOOL d127fb9d87f9abdc574a32228245633e4a29fbc464a213b13a688f9aaafcc53f64659dcabf252a98241b596e8a852ff19726c57da29185f57275346e092d6d88
 DIST yesod-static-1.4.0.4.tar.gz 25101 SHA256 13ab0f7ac81aa2ebacbccef142e2e5f832e747891e0ac67097cd64b5f3a801fc SHA512 598e1ba668f73c639afb786ed6b210ff9c62c9e12fabc87d6682c9876b08e96b43b7dbb4d53ac8bbe7c1c11b709d1a6e8c231f46598b74c271909d26fb26edb3 WHIRLPOOL 7462dc2e9de491d6b80bec3ad0cd72f2ca053fed855087392bf2585feea10f03dbf8fab13573dfa51b0c0ecf99f5d0fd7c37fc469c1d47c93ca17ea2976ab180
 DIST yesod-static-1.5.0.1.tar.gz 25033 SHA256 f4caebb36fa7f4e19ec499a523c27b85c23b076e0cec2774c29539d54e0daaf9 SHA512 22ff57bbc8c5d8a307e4c7115c8c139e91d1eff0e8fb5ffeeda39692e8859b8df4e3cf8490785aa7ffd81f7c8d480168af8570284909f165aa9415cfacebb98b WHIRLPOOL 8f6fe40e1ff574e923342d7e7f9e689ca387f4ddd41ee070d683201888860b57cc493e964713b039e9ecc283920c7e3307c5117d8b4a9a84d2515a7e481479c9
+DIST yesod-static-1.5.0.3.tar.gz 25036 SHA256 a46f952593fc36323aba1352b4b7a2703bb609ec19b709447268e7be24f8ce74 SHA512 5fd0de8c034063b637ff90382fb5fb31e810eff196327becd6b217df39b9bf8612deb56ffc8996395c7a46223983333c45f14020952422260aea3629d6429122 WHIRLPOOL 916ec29666026ff26d92efef89a936b5c76c893b0c5bff06309fbf15ee0575f45d4f3cb951bc34dd3269afb7cddfc88a8b0bfdae86246e9bc7325f23e6b24553
diff --git a/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild b/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild
new file mode 100644
index 000000000000..296fb1f7c0d6
--- /dev/null
+++ b/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Static file serving subsite for Yesod Web Framework"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/byteable-0.1:=[profile?]
+	>=dev-haskell/conduit-0.5:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	>=dev-haskell/cryptohash-0.11:=[profile?]
+	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
+	>=dev-haskell/css-text-0.1.2:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
+	>=dev-haskell/hashable-1.1:=[profile?]
+	dev-haskell/hjsmin:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/mime-types-0.1:=[profile?]
+	>=dev-haskell/old-time-1.0:=[profile?]
+	>=dev-haskell/resourcet-0.4:=[profile?]
+	>=dev-haskell/text-0.9:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/wai-app-static-3.1:=[profile?]
+	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/wai-extra
+		>=dev-haskell/yesod-test-1.4 )
+"
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
index 5bed8f4521b6..1e373171931f 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -3,3 +3,4 @@ DIST yesod-test-1.2.3.1.tar.gz 13265 SHA256 ba12185bba546c0057688e6268ed67689724
 DIST yesod-test-1.4.2.1.tar.gz 14105 SHA256 d16ecd1342cc30b80683cadf6e3b5e8e6193a65dc1891753d25a0aa1f627fa40 SHA512 1c1075d555ea8cc6fb75604e52d2bd24e82d09d48ca8fd4be80c0a1227f4c6521dbb9cdd86369d8194f544bf52f2b1572367774496c09003ac461c1163bc7aa2 WHIRLPOOL 998bb15f32a129367cca6c786a9cd3e7ff578cec9fdf3df4988ded40e57e29f9149f8cd8bdb11885e2da3e0196573c88e80ae30880bfc7820748c12abbf5005e
 DIST yesod-test-1.4.2.tar.gz 14081 SHA256 74397acb82b9d9d862453f21a7c1da6aa0634f3ad7850bbd0a84bf4837523126 SHA512 d81bda12908c76b70cc82c8bcf4e6f164618ee273e646e00a287ae075094200e866af2bfdc62fac05a775bceef5777f07bf4e6a0747843f8379417ca552c2e9a WHIRLPOOL 0137a6a23f17463c79b20d3404f07f1a564ecab6a40095d469d294790a9bf9e595e4cdf59cc6f117cd46a1ad827f2bb72018e9afcf1145341c564861e7b47434
 DIST yesod-test-1.4.3.1.tar.gz 15284 SHA256 a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394 SHA512 c423c10a10264a301418cf044aff1d8d8aab483039575e255c6bb29bffe91494a8e8f85e9c12b31aee6c394384b97356a4b64377f25d0781e516946d352aab13 WHIRLPOOL 2c67595ec9e1541dac087bfbe9e488f75eb5856eee267a493ff4ae6d8b2674f6f356eafec53a7599d3220e21539ba805e4cfe923872673468a34f66f2ec6ad79
+DIST yesod-test-1.5.0.1.tar.gz 17388 SHA256 9b19fb51e901935f8b0926e3b9bbae772d45967a747fb3a1bf9cb893724c29a4 SHA512 f5798198d762415e8f0b97b63202393e2c4a41c8021cfda2db0b4f9144830d73be1ec5397da3a3de25b056798683955a1ff856eba93c64c172642c8cca6ada2d WHIRLPOOL b71c48dd714625209530120598305e5f77a0161049efc4bc979d41fe9e47927424e98a93d2f4fbc9c93c854db4c0161f4d814264eb0ecd7726eba7a141fcf802
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild
new file mode 100644
index 000000000000..7c515289dc7a
--- /dev/null
+++ b/dev-haskell/yesod-test/yesod-test-1.5.0.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
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="integration testing for WAI/Yesod Applications"
+HOMEPAGE="http://www.yesodweb.com"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+	>=dev-haskell/html-conduit-0.1:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	>=dev-haskell/network-2.2:=[profile?]
+	>=dev-haskell/persistent-1.0:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?]
+	dev-haskell/wai-extra:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?]
+	>=dev-haskell/yesod-core-1.4.14:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hspec
+		dev-haskell/yesod-form )
+"
diff --git a/dev-haskell/yesod/Manifest b/dev-haskell/yesod/Manifest
index 27d966e36373..e8c220185d00 100644
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@@ -2,3 +2,4 @@ DIST yesod-1.2.6.tar.gz 7834 SHA256 e03b2d05aac6b18bb7ff47afb501e186663ff09de5be
 DIST yesod-1.4.1.3.tar.gz 9555 SHA256 b2cfaadec2f8352f1906e06e8cdcd2cd57f8a035af8bd2b7585afa4a5ddd00fc SHA512 f7887afc39cdcf4d91d9a3cb37a0b3c5d9b34e991d492fe5c04019d5c11fed56022ca25d4a263f6b51600c0506e67e5d85fbd50404c78b8b18207d33d3af4a4f WHIRLPOOL e8990e60772bec6e383bdbc45f591e1d6a04a2f38ad311be7dcba27808d2a121af6f0bdaa92ff9d8bb3e61e30ec964b597d75643febdfe15d8f37dac931157d2
 DIST yesod-1.4.1.4.tar.gz 9550 SHA256 3dd4ac0b61ac117a8b37ef5f8abd0bef25944ac25ee04fb14bbe60ab6cd166ab SHA512 788991d783ba00149028b5f2431de008f50e812866f9ba9119fc90625b481e959e870de411721c678d42a2fac69b51a18b9c7529f2a67331b6911ead8c937329 WHIRLPOOL efd971ea2652a3b92e2f624c8d3ebc3dd8a17e0d7c7833e9b5f512f5a60ff3138d067743a066219c99118b25a2408905ff7378764f827dfb2e0b36fdd7e383ac
 DIST yesod-1.4.1.5.tar.gz 9570 SHA256 a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b SHA512 d67a82f26023ea7ef729e01713223a7459cb2c599a44a183b9a0cd9bdd7f51ed30a80bc68d48de1bd22d87d97eb55ddb4a29feec3960258b9c57451094e7d38d WHIRLPOOL d28d0fca6f39eb737f4a218d6af5cfa27294408d0393403068dd6484dd6bb233719654cecfa16a7b6c1180273f739e4f357e436ba296bba7bf20031e15f55d40
+DIST yesod-1.4.2.tar.gz 9801 SHA256 d6d13e608af954de23721261b39ee79569907beb173477db8820acc5e9f45757 SHA512 dae87a0c2c3f6f6b8ef47c2648e73f8e12756798d785d683ad9f9c6bb5535446a398df85fe8123fd0a38069b167b08cc8d98bef31cff1ce6000d7b0af1fb0922 WHIRLPOOL 65893edf0dde30bedb486642a6212fb5a910ea27fedefdaf91a133600895355ff04b94a7940fdd2372bb8518734d26fc4182ddc5eede63f0fc3af9317c00a79d
diff --git a/dev-haskell/yesod/yesod-1.4.2.ebuild b/dev-haskell/yesod/yesod-1.4.2.ebuild
new file mode 100644
index 000000000000..9c6fad0e92b6
--- /dev/null
+++ b/dev-haskell/yesod/yesod-1.4.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	dev-haskell/fast-logger:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/shakespeare:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/wai-extra-1.3:=[profile?]
+	dev-haskell/wai-logger:=[profile?]
+	>=dev-haskell/warp-1.3:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
+	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
+	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
+	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r2.ebuild
index ca46888de0a7..e37bbd6acdab 100644
--- a/dev-java/annogen/annogen-0.1.0-r2.ebuild
+++ b/dev-java/annogen/annogen-0.1.0-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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 CDEPEND="
 	dev-java/qdox:1.6
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
index 1f6f33cd556d..b68bbb39b955 100644
--- a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm 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"
 
 RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
index 754013fa4bd1..5da963b6766c 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="bcel"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/bcel-5.1-r3:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
index 8c70ce17ee59..aa255a7e9fdc 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
index 0d8b1507919d..3cd2e80f7ed3 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
index 2bca7faeab73..1b80650d5a36 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
index bfd291c9b537..cd99cccee1c4 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
index 0c02493b4310..b2ad88728779 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
index 464e2744d4b8..c4f4e7482131 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND="dev-java/xalan:0
 	dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
index 25fb894689dc..6fe5e36ebf23 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.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$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
index 7d0b23b7e42f..b6f73a1fc8c6 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.2.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$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
index 1604cd90ba45..fb7d132a09b4 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://ant-contrib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 #	test? ( dev-java/ant-junit dev-java/ant-testutil )
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
index 2cfb3264a294..a8da54715f04 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 
 #	test? ( dev-java/ant-junit dev-java/ant-testutil )
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index ccd471aa4719..91372a947bd8 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.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$
 
@@ -22,7 +22,7 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
 	!dev-java/ant-tasks
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
index 8f2be6cf7db3..752b04a37d6f 100644
--- 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
@@ -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 @@ 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 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="3.7"
 IUSE=""
 
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
index d0fba0a6683d..e82ab821b68c 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF/.0}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.2"
 IUSE=""
 
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
index c27ffb0bdeb7..67a85ed47c44 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.4"
 IUSE=""
 
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
index 5954842302a9..a3a080c00968 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.5"
 IUSE=""
 
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
index dcb06c406c51..880abd2a8560 100644
--- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
index dcdf04ebc139..5c049d50e81d 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.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$
 
@@ -23,7 +23,7 @@ SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 COMMON_DEP="
 	dev-java/ant-core:0
diff --git a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
index 9b482b8a76a7..bde6e7d36fac 100644
--- a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.0.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$
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 RESTRICT="test" # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet
 
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
index 6ec6cbc592d8..51548c1c556e 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-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$
 
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
 RESTRICT="test"
diff --git a/dev-java/ant-jai/ant-jai-1.9.2.ebuild b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
index 1d3d087d7653..df2a93d1eeaf 100644
--- a/dev-java/ant-jai/ant-jai-1.9.2.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 
 # Unmigrated, has textrels and there's also some source one now too.
 DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild
index e6b511ad56db..69a1204e6cea 100644
--- a/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.9.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="--virtual oracle-javamail"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~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"
 
 DEPEND="dev-java/oracle-javamail:0
 	java-virtuals/jaf:0"
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild
index 8a33236d3d01..a6ce8aba5338 100644
--- a/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2.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$
 
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="--virtual javamail"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND="java-virtuals/javamail
 	java-virtuals/jaf"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
index ef849d37c740..5f929dd67005 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.2.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$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/jdepend-2.9-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
index f061fb71913d..459af9323f47 100644
--- a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.9.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$
 
@@ -12,4 +12,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
index 8928ce20f93c..bff6c58b6a36 100644
--- a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.9.2.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$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=dev-java/jsch-0.1.37:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/ant-junit-1.9.2.ebuild b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
index f202b92d6431..629a7199ed6f 100644
--- a/dev-java/ant-junit/ant-junit-1.9.2.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.9.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 ant-tasks
 
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/junit:4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
index 8edd055f37a1..ad1d674d728b 100644
--- a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.9.2.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$
 
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME="junit-4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 
 DEPEND="dev-java/junit:4
 	~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
index 11093dfac280..0ac1bc06d87d 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.9.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$
 
@@ -10,7 +10,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
 inherit ant-tasks
 
 DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Dependency needed for jar.
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
index d1541235fa08..7a2d5d2431f0 100644
--- a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
+++ b/dev-java/ant-owanttask/ant-owanttask-1.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_${PV}.zip
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 
 COMMON_DEP="dev-java/xalan"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/ant-swing/ant-swing-1.9.2.ebuild b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
index b80540dd3276..03b2ba346a0b 100644
--- a/dev-java/ant-swing/ant-swing-1.9.2.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.9.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$
 
@@ -11,4 +11,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Swing"
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
index 676c63e31668..07d26a727489 100644
--- a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.9.2.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$
 
@@ -7,7 +7,7 @@ EAPI="5"
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/ant-trax/ant-trax-1.9.2.ebuild b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
index a2b6ee082bb0..8e7ce741fd1f 100644
--- a/dev-java/ant-trax/ant-trax-1.9.2.ebuild
+++ b/dev-java/ant-trax/ant-trax-1.9.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$
 
@@ -10,7 +10,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm 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"
 
 # Dependency needed for jar.
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/ant/ant-1.9.2.ebuild b/dev-java/ant/ant-1.9.2.ebuild
index 7ad645263e2a..9d275884fa45 100644
--- a/dev-java/ant/ant-1.9.2.ebuild
+++ b/dev-java/ant/ant-1.9.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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND="~dev-java/ant-core-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index dec6bd95bcfd..19c39cb24c64 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples source"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 5d9561d94df5..b8a051292daa 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
 	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index 33d4d91af0c0..acaad6faa25e 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.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$
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/stringtemplate:4"
diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
index cc1b6136dfc0..409a9d438aef 100644
--- a/dev-java/antlr/antlr-4.4.ebuild
+++ b/dev-java/antlr/antlr-4.4.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 @@ http://www.antlr3.org/download/${JAR_LIST[0]}
 http://www.antlr.org/download/${JAR_LIST[1]}"
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gunit"
 
 CDEPEND="
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index 17c21dc8af41..6fe3fe43be6a 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/antlr:3.5
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index d830be462acf..bc08a5c630f4 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-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$
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
 LICENSE="public-domain"
 SLOT="1"
 
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
index 8d5a23a45234..988790c758a9 100644
--- a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://developer.apple.com/samplecode/AppleJavaExtensions/"
 SRC_URI="http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> ${P}.zip"
 LICENSE="Apple"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5.ebuild
index ee80d0ee07d5..0625562dea5a 100644
--- a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5.ebuild
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://developer.apple.com/samplecode/AppleJavaExtensions/"
 SRC_URI="http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> ${P}.zip"
 LICENSE="Apple"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
index 78bd7728254c..eec5f753555b 100644
--- a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
+++ b/dev-java/apt-mirror/apt-mirror-1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/dev-java/asm/asm-2.0-r1.ebuild b/dev-java/asm/asm-2.0-r1.ebuild
index f505db0b3a26..8d346300f10e 100644
--- a/dev-java/asm/asm-2.0-r1.ebuild
+++ b/dev-java/asm/asm-2.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$
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://asm.objectweb.org"
 SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="doc source"
 DEPEND=">=virtual/jdk-1.3
 	dev-java/ant-core
diff --git a/dev-java/asm/asm-2.0-r2.ebuild b/dev-java/asm/asm-2.0-r2.ebuild
index 0f70ce6604d1..ea467db8064b 100644
--- a/dev-java/asm/asm-2.0-r2.ebuild
+++ b/dev-java/asm/asm-2.0-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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://asm.objectweb.org"
 SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="doc source"
 
 CDEPEND="dev-java/ant-core:0
diff --git a/dev-java/asm/asm-2.2.3-r1.ebuild b/dev-java/asm/asm-2.2.3-r1.ebuild
index 19b311bf264f..40f0deb23f59 100644
--- a/dev-java/asm/asm-2.2.3-r1.ebuild
+++ b/dev-java/asm/asm-2.2.3-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$
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://asm.objectweb.org"
 SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="2.2"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc source"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
diff --git a/dev-java/asm/asm-2.2.3-r2.ebuild b/dev-java/asm/asm-2.2.3-r2.ebuild
index 0b969706e64d..0f40557ee3b7 100644
--- a/dev-java/asm/asm-2.2.3-r2.ebuild
+++ b/dev-java/asm/asm-2.2.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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://asm.objectweb.org"
 SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="2.2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc source"
 
 CDEPEND="dev-java/ant-core:0
diff --git a/dev-java/asm/asm-3.3.1-r1.ebuild b/dev-java/asm/asm-3.3.1-r1.ebuild
index 3eead3a7300a..59389d859abd 100644
--- a/dev-java/asm/asm-3.3.1-r1.ebuild
+++ b/dev-java/asm/asm-3.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/asm/asm-3.3.1.ebuild b/dev-java/asm/asm-3.3.1.ebuild
index 809950ee4215..cb1f997435c0 100644
--- a/dev-java/asm/asm-3.3.1.ebuild
+++ b/dev-java/asm/asm-3.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 IUSE=""
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/asm/asm-4.0-r1.ebuild b/dev-java/asm/asm-4.0-r1.ebuild
index f3dc1e6f2a3c..43faf131b996 100644
--- a/dev-java/asm/asm-4.0-r1.ebuild
+++ b/dev-java/asm/asm-4.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc ~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/asm/asm-4.0.ebuild b/dev-java/asm/asm-4.0.ebuild
index 225d7825543a..45d6bd1ba7fd 100644
--- a/dev-java/asm/asm-4.0.ebuild
+++ b/dev-java/asm/asm-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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="amd64 ~arm ppc 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/asm/asm-5.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
index d006b9f27836..c15bacc2bb20 100644
--- a/dev-java/asm/asm-5.0.3.ebuild
+++ b/dev-java/asm/asm-5.0.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="amd64 ~arm ~ppc ~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/asm/asm-5.0.4.ebuild b/dev-java/asm/asm-5.0.4.ebuild
index ecc14322ad0b..414109a8832c 100644
--- a/dev-java/asm/asm-5.0.4.ebuild
+++ b/dev-java/asm/asm-5.0.4.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 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
new file mode 100644
index 000000000000..06844c3848b1
--- /dev/null
+++ b/dev-java/assertj-core/Manifest
@@ -0,0 +1 @@
+DIST assertj-core-2.3.0.tar.gz 611609 SHA256 6bb86e5bb7d65599c09a87df276fe049333e9d0cca25de902be83971940dc8dc SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3 WHIRLPOOL 9fa7c74e2f4f4c4f2a03dd2b22a6525e753c092b1ba2185e4a7d12c460dc43d08b9910e8fce3ce62092b8916f5c6939648c5df230d3be8c363f24cc6eafc9063
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
new file mode 100644
index 000000000000..949ca8869b3e
--- /dev/null
+++ b/dev-java/assertj-core/assertj-core-2.3.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"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that provides a fluent interface for writing assertions"
+HOMEPAGE="http://joel-costigliola.github.io/assertj/"
+SRC_URI="https://github.com/joel-costigliola/${PN}/archive/${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="2"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="cglib-3,junit-4"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {CONTRIBUTING,README}.md
+}
diff --git a/dev-java/assertj-core/metadata.xml b/dev-java/assertj-core/metadata.xml
new file mode 100644
index 000000000000..dd06c6df5bc8
--- /dev/null
+++ b/dev-java/assertj-core/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>AssertJ core is a Java library that provides a fluent interface for writing assertions. Its main goal is to improve test code readability and make maintenance of tests easier. AssertJ core provides assertions for JDK standard types can be used with either JUnit or TestNG.</longdescription>
+</pkgmetadata>
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
index 44f3d3ec2ffe..9ab977bf2f97 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
index 195afe333c8b..939c5218ae5a 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-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$
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
index 970a1c10146f..074a2c8f637b 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP="=dev-java/avalon-logkit-2*
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index c80b883eaebf..43c01e5d5f27 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-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$
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
index 651c72a0bb95..ed209747cf88 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="1.2"
 IUSE=""
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 
 COMMON_DEP="
 	dev-java/avalon-framework:4.1
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild
index 751b51706a37..ad10b34048ef 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.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$
 
@@ -11,7 +11,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
 
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 IUSE=""
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
index 3ccdb1b53faf..d948aace530b 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.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 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 IUSE=""
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild
index 6c817eaa10bd..aa5aa3f9d94c 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.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 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 IUSE=""
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
index 334dbee94b1a..6438b053ad1b 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.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 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 IUSE=""
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 9a251f880751..d633a59f1dba 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
index 904a29a18fa0..53f7d0e185df 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/batik/batik-1.8-r2.ebuild b/dev-java/batik/batik-1.8-r2.ebuild
index 79bf96db90bf..7d4a6fb64ff3 100644
--- a/dev-java/batik/batik-1.8-r2.ebuild
+++ b/dev-java/batik/batik-1.8-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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.8"
-KEYWORDS="amd64 x86 ppc ppc64 ~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"
 IUSE="doc python tcl"
 
 CDEPEND="dev-java/xalan:0
diff --git a/dev-java/bcel/bcel-5.2-r2.ebuild b/dev-java/bcel/bcel-5.2-r2.ebuild
index 624707c6e07d..33b7bccfdc7c 100644
--- a/dev-java/bcel/bcel-5.2-r2.ebuild
+++ b/dev-java/bcel/bcel-5.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~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="-findbugs"
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/bcel/bcel-5.2-r3.ebuild b/dev-java/bcel/bcel-5.2-r3.ebuild
index 67e2b8bb1b5f..ac8c8d9eb9bb 100644
--- a/dev-java/bcel/bcel-5.2-r3.ebuild
+++ b/dev-java/bcel/bcel-5.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~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="-findbugs"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
index 2b8581b3b4c4..1018aca5d713 100644
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ b/dev-java/bcel/bcel-6.0_rc3.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 @@ SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~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="test"
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/bcmail/bcmail-1.38-r4.ebuild b/dev-java/bcmail/bcmail-1.38-r4.ebuild
index b55f9d3ff6a6..c0470f9cd659 100644
--- a/dev-java/bcmail/bcmail-1.38-r4.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.38"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/bcprov:${SLOT}
diff --git a/dev-java/bcmail/bcmail-1.38-r5.ebuild b/dev-java/bcmail/bcmail-1.38-r5.ebuild
index 3ff2db80394d..cbbf2449b0e1 100644
--- a/dev-java/bcmail/bcmail-1.38-r5.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r5.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 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.38"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/bcprov:${SLOT}
diff --git a/dev-java/bcmail/bcmail-1.45-r3.ebuild b/dev-java/bcmail/bcmail-1.45-r3.ebuild
index 547575d17432..6f17478a1303 100644
--- a/dev-java/bcmail/bcmail-1.45-r3.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.45"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/bcprov:${SLOT}
diff --git a/dev-java/bcmail/bcmail-1.45-r4.ebuild b/dev-java/bcmail/bcmail-1.45-r4.ebuild
index 0c6fd8674c64..f308e75eeeb4 100644
--- a/dev-java/bcmail/bcmail-1.45-r4.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.45"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/bcprov:${SLOT}
diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild b/dev-java/bcmail/bcmail-1.50-r2.ebuild
index 2c3e0455a5c4..fa5eb41312e5 100644
--- a/dev-java/bcmail/bcmail-1.50-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.50-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND="dev-java/bcprov:${SLOT}
 	dev-java/bcpkix:${SLOT}
diff --git a/dev-java/bcmail/bcmail-1.52-r2.ebuild b/dev-java/bcmail/bcmail-1.52-r2.ebuild
index 15606fc39df9..b8a2681c0223 100644
--- a/dev-java/bcmail/bcmail-1.52-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.52-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND="dev-java/bcprov:${SLOT}
 		dev-java/bcpkix:${SLOT}
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild
index d52ada51679a..9593f965aa13 100644
--- a/dev-java/bcpg/bcpg-1.50-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.50-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 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 # Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
 # Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
index 1a6a57a84ee6..0aece40a7b78 100644
--- a/dev-java/bcpg/bcpg-1.52-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.52-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 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 # Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
 # Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
index 11b3ac6cff6b..9729af25e093 100644
--- a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.50-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$
 
@@ -15,7 +15,7 @@ DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD"
 SLOT="1.50"
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
index be37ad7f371f..76ce7b19ea7e 100644
--- a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.52-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$
 
@@ -15,7 +15,7 @@ DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD"
 SLOT="1.52"
diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild
index 2f75cba835c6..f6cb22f679d0 100644
--- a/dev-java/bcprov/bcprov-1.38-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.38-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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.38"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.40-r2.ebuild b/dev-java/bcprov/bcprov-1.40-r2.ebuild
index 04c02fb8bb2d..e17ee8b63204 100644
--- a/dev-java/bcprov/bcprov-1.40-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.40-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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.40"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild
index 28c5f32e5c4b..f90afd231481 100644
--- a/dev-java/bcprov/bcprov-1.45-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.45-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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.45"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.48-r2.ebuild b/dev-java/bcprov/bcprov-1.48-r2.ebuild
index 795b0383c3f6..0bcfbad39985 100644
--- a/dev-java/bcprov/bcprov-1.48-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.48-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.48"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.49-r4.ebuild b/dev-java/bcprov/bcprov-1.49-r4.ebuild
index 17d91d24241a..3eb4dd1c6ed5 100644
--- a/dev-java/bcprov/bcprov-1.49-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.49-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.49"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
index b0deca88b8cd..6ae7dd36c38a 100644
--- a/dev-java/bcprov/bcprov-1.50-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.50-r3.ebuild b/dev-java/bcprov/bcprov-1.50-r3.ebuild
index b10fce6228d4..a60928ae62bd 100644
--- a/dev-java/bcprov/bcprov-1.50-r3.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
index d2a0a1c56449..75f7db823a0e 100644
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild
index add187a0f716..65cbbcbba6e6 100644
--- a/dev-java/bcprov/bcprov-1.52-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-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 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.52-r2.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild
index 990b7ff3356e..160c8dc762f4 100644
--- a/dev-java/bcprov/bcprov-1.52-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
index bf6cfaf15880..9563c7b649c2 100644
--- a/dev-java/bcprov/bcprov-1.52-r3.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
index 110a4aff1c5e..e54b2b53a2ba 100644
--- a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
+++ b/dev-java/blowfishj/blowfishj-2.14-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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://blowfishj.sourceforge.net/index.html"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
index d23cf65850cd..901a3433de16 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/browserlaunch2/${MY_PN}-all-${MY_PV}.jar"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/bsf/bsf-2.4.0-r1.ebuild b/dev-java/bsf/bsf-2.4.0-r1.ebuild
index 5bfdfc3fd626..cb5590cd64dd 100644
--- a/dev-java/bsf/bsf-2.4.0-r1.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/bsf/"
 SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 # If you add new ones, add them to ant-apache-bsf too for use dependencies
 IUSE="javascript python tcl"
 
diff --git a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
index 706b616c6e94..0952aaef5c98 100644
--- a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.beanshell.org/${MY_DIST} mirror://gentoo/beanshell-icon.png"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bsf readline"
 # some tests fail but ant doesn't fail
 RESTRICT="test"
diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild
index 76cdf988d153..2306bc1a1500 100644
--- a/dev-java/byaccj/byaccj-1.15-r1.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-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,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${PN}${PV}"
diff --git a/dev-java/bytelist/bytelist-1.0.10.ebuild b/dev-java/bytelist/bytelist-1.0.10.ebuild
index 6d066f4ac330..a90d199c6000 100644
--- a/dev-java/bytelist/bytelist-1.0.10.ebuild
+++ b/dev-java/bytelist/bytelist-1.0.10.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEP="dev-java/jcodings:0"
 
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
index 972c30682c72..a0788ecb5bfa 100644
--- a/dev-java/c3p0/c3p0-0.9.5.1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
@@ -15,7 +15,7 @@ MY_P="${P}.src"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild
index b0f52bd8eaf6..cbe45605f8d1 100644
--- a/dev-java/cacao/cacao-0.99.4.ebuild
+++ b/dev-java/cacao/cacao-0.99.4.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$
 
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 CLASSPATH_SLOT=0.98
 COMMON_DEPEND="
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index 3c8e21a0b4db..21c0b695a163 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.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,7 +14,7 @@ SRC_URI="http://repo1.maven.org/maven2/ch/qos/${PN}/${PN}-api/${PV}/${PN}-api-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
index 4bda64badecc..cd92c9ebb049 100644
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cdegroot.com/software/db/download/com.${P/-/.}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 x86 ppc64 ppc"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index fa4a7fb9dd4d..d8a2d627af27 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,2 +1 @@
-DIST cglib-src-3.0.jar 1537863 SHA256 40f8cc721f80b820207f0061b10ad51151f577b2d7d94d93f19a85aa2551e674 SHA512 7791c36ed1908ddbc35a0bf1f4f54c3554b0fe4f707b318d7d24189fb513d8712335f2e41f90065e8eb102657d53699cc709a1b9f7a12a8f924c6a755969a829 WHIRLPOOL d9e4f80e7cbe1bc39aad654e437347551e13c66bcc3139f8991e870c123bdd83603a26b9d5a07a902c2fa668ba7cb42285417578b836e195f5660b691c6ddc79
 DIST cglib-src-3.1.jar 1541525 SHA256 386f9a55ae8fed3cf8014f2c20344ce9ce05cd2e4fa467e5e4d8027abb3d62eb SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f WHIRLPOOL e3a865296790e1de31889e7624797418392466f7756567382fa9c0b1108d386ee848be2e6b4e96db206101cde8d0320293e58d0b83e0a5a7633afc46b3a37e22
diff --git a/dev-java/cglib/cglib-3.0.ebuild b/dev-java/cglib/cglib-3.0.ebuild
deleted file mode 100644
index 09b8dfa07466..000000000000
--- a/dev-java/cglib/cglib-3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-HOMEPAGE="http://cglib.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-# Fails some tests on ppc(64) due to memory-related issues that are
-# probably VM-specific but harmless enough.
-RESTRICT="ppc? ( test ) ppc64? ( test )"
-
-COMMON_DEP="dev-java/asm:4
-	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )
-	${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4 ant-core"
-
-java_prepare() {
-	find . -iname '*.jar' -delete || die
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/proxy/net
-	use examples && java-pkg_doexamples --subdir samples src/proxy/samples
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
index c2d4fa4b349d..e692eb100fbd 100644
--- a/dev-java/cglib/cglib-3.1.ebuild
+++ b/dev-java/cglib/cglib-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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/charva/charva-1.1.4-r1.ebuild b/dev-java/charva/charva-1.1.4-r1.ebuild
index 8c7dd2f2ecf1..56ad97d3a2d4 100644
--- a/dev-java/charva/charva-1.1.4-r1.ebuild
+++ b/dev-java/charva/charva-1.1.4-r1.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$
 
@@ -19,7 +19,7 @@ DEPEND=">=virtual/jdk-1.5
 		${RDEPEND}"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 S="${WORKDIR}/${PN}"
diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
index d4554dc95285..04388ddcd811 100644
--- a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
+++ b/dev-java/cldc-api/cldc-api-1.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$
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 # move tarball to distdir, scp to d.g.o...
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 SLOT="1.1"
 IUSE=""
 
diff --git a/dev-java/codemodel/codemodel-2.6.ebuild b/dev-java/codemodel/codemodel-2.6.ebuild
index 6f8630b98d3b..31860abf083f 100644
--- a/dev-java/codemodel/codemodel-2.6.ebuild
+++ b/dev-java/codemodel/codemodel-2.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://repo.maven.apache.org/maven2/com/sun/${PN}/${PN}/${PV}/${P}-sour
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 DEPEND=">=virtual/jdk-1.5
 		app-arch/unzip"
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
index f3bc76b54dd1..1aca6f8fd697 100644
--- a/dev-java/colt/colt-1.2.0-r2.ebuild
+++ b/dev-java/colt/colt-1.2.0-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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
 LICENSE="colt"
 IUSE=""
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/concurrent-util-1.3.4:0"
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index c6f4fcea6aa3..d4c4a38f2c15 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.7"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="dev-java/commons-collections:0
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
index dc349c8e6b73..9fdfd0f0fec9 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.8.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$
 
@@ -11,7 +11,7 @@ DESCRIPTION="Introspective Bean to XML mapper"
 
 LICENSE="Apache-2.0"
 SLOT="0.7"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/commons-cli/commons-cli-1.2.ebuild b/dev-java/commons-cli/commons-cli-1.2.ebuild
index ab0241aa4a4e..cc4285ccb380 100644
--- a/dev-java/commons-cli/commons-cli-1.2.ebuild
+++ b/dev-java/commons-cli/commons-cli-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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/commons/cli/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RESTRICT=""
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
index 312298663560..fde053d7c798 100644
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.7.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index 44bab4b95637..5e542cf54a5f 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.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$
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
index cdad0435679c..bbf7ebc81bcd 100644
--- a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
+++ b/dev-java/commons-configuration/commons-configuration-1.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$
 
@@ -33,7 +33,7 @@ RDEPEND=">=virtual/jre-1.6
 LICENSE="Apache-2.0"
 SLOT="0"
 
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
index 9eb9baaede61..235c8f0b0b3b 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://commons.apache.org/daemon/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="kernel_linux"
 
 COMMON_DEP="kernel_linux? ( sys-libs/libcap )"
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.7.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.7.ebuild
index cb0ff226b4ef..9068ba418572 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.7.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.7.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://commons.apache.org/daemon/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE="kernel_linux"
 
 COMMON_DEP="
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
index 294fa0646ae8..44c9b054eea7 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.9.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://commons.apache.org/daemon/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="kernel_linux"
 
 COMMON_DEP="
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
index fd5f18906c70..661b176c5e98 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/dbcp/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index 12a832860b1c..68b28d86b3bd 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 CDEPEND="dev-java/commons-beanutils:1.7
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index 7acefe402e94..e89ed137d4fd 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 
 CDEPEND="dev-java/commons-beanutils:1.7
 	>=dev-java/commons-collections-2.1:0
diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
index a0978683ea83..85f9630087b8 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/cglib:3
 	dev-java/commons-beanutils:1.7
diff --git a/dev-java/commons-discovery/commons-discovery-0.4.ebuild b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
index efa00477e4b5..f0585c716369 100644
--- a/dev-java/commons-discovery/commons-discovery-0.4.ebuild
+++ b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 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="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="doc source test"
 
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
index d1e8a031ccef..9f8233583c5d 100644
--- a/dev-java/commons-el/commons-el-1.0-r3.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-r3.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,7 +14,7 @@ SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/commons-email/commons-email-1.4.ebuild b/dev-java/commons-email/commons-email-1.4.ebuild
index 8821e566f647..c7d4aeff5a61 100644
--- a/dev-java/commons-email/commons-email-1.4.ebuild
+++ b/dev-java/commons-email/commons-email-1.4.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 @@ HOMEPAGE="http://commons.apache.org/email/"
 SRC_URI="mirror://apache/commons/email/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 # Requires a slew of packages we don't ship yet.
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
index 7e24da2d6ee8..376781aed51c 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.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,7 +14,7 @@ SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
index 53634338ea40..4670b79cfc62 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://hc.apache.org/"
 SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 # doesn't work with IBM JDK, bug #176133
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index feaf74102379..23aa41f9cd14 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.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="mirror://apache/commons/io/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
index 424d1f51257f..0410ea326ee8 100644
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-1.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$
 
@@ -23,7 +23,7 @@ DEPEND=">=virtual/jdk-1.6
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
index dcfec793773d..6c28a864a38c 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-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,7 +13,7 @@ SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild
index bcbf18f6faf7..660c02a16134 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
index 5e37f87f865c..e73331c33806 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index ef47b3ce2f26..9b5971b78b17 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-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$
 
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index ef6cb2bbd13b..a690dd3a6a9a 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/lang/"
 SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 SLOT="2.1"
 IUSE=""
 
diff --git a/dev-java/commons-lang/commons-lang-3.1.ebuild b/dev-java/commons-lang/commons-lang-3.1.ebuild
index 17df9a25ca58..7a5df415369a 100644
--- a/dev-java/commons-lang/commons-lang-3.1.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.1.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$
 
@@ -20,7 +20,7 @@ RDEPEND=">=virtual/jre-1.5"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
index 6b5a021629c8..ea167776de61 100644
--- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.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$
 
@@ -28,7 +28,7 @@ RDEPEND=">=virtual/jre-1.6"
 
 LICENSE="Apache-2.0"
 SLOT="3.3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 RESTRICT="ppc? ( test ) ppc64? ( test )"
 
 S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild b/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild
index 8f2170e75fe2..3308b11c5802 100644
--- a/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild
+++ b/dev-java/commons-launcher/commons-launcher-1.1-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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/launcher/"
 SRC_URI="mirror://apache/jakarta/${PN/-//}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
index 6f1ff9cce5f0..e9a1c8549d01 100644
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ b/dev-java/commons-logging/commons-logging-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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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="avalon-logkit log4j servletapi avalon-framework"
 
 COMMON_DEP="
diff --git a/dev-java/commons-net/commons-net-1.4.1-r1.ebuild b/dev-java/commons-net/commons-net-1.4.1-r1.ebuild
index 5e68dfbb5899..cc55f0138322 100644
--- a/dev-java/commons-net/commons-net-1.4.1-r1.ebuild
+++ b/dev-java/commons-net/commons-net-1.4.1-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$
 
@@ -22,7 +22,7 @@ DEPEND=">=virtual/jdk-1.3
 	${COMMON_DEP}"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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=""
 
 # disabling unit tests:
diff --git a/dev-java/commons-net/commons-net-3.2.ebuild b/dev-java/commons-net/commons-net-3.2.ebuild
index 450521068ad4..f7af65216781 100644
--- a/dev-java/commons-net/commons-net-3.2.ebuild
+++ b/dev-java/commons-net/commons-net-3.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$
 
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.5"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~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"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
index 4f29826e7f21..0d7a431a9ebc 100644
--- a/dev-java/commons-pool/commons-pool-1.6.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.6.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,7 +14,7 @@ SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild b/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild
index 76411ef52b5d..3ba051bc3ed1 100644
--- a/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.3"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 # Would need an old version of commons-collections and this would be the
diff --git a/dev-java/commons-validator/commons-validator-1.4.0.ebuild b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
index b33072655c42..f36de6bbe1ca 100644
--- a/dev-java/commons-validator/commons-validator-1.4.0.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.4.0.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-digester-1.6:0
diff --git a/dev-java/commons-validator/commons-validator-1.4.1.ebuild b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
index 6c017fb350d0..dc68b2b2c8eb 100644
--- a/dev-java/commons-validator/commons-validator-1.4.1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.4.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 
 RDEPEND=">=virtual/jre-1.6
 	>=dev-java/commons-digester-1.6:0
diff --git a/dev-java/commons-vfs/commons-vfs-1.0.ebuild b/dev-java/commons-vfs/commons-vfs-1.0.ebuild
index 0818ef639ddd..190800c77f21 100644
--- a/dev-java/commons-vfs/commons-vfs-1.0.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 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://apache/jakarta/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
index 7098deb03c5e..c421a539210f 100644
--- a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
+++ b/dev-java/concurrent-util/concurrent-util-1.3.4-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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/gentoo-concurrent-util-1.3.4.tar.bz2"
 
 LICENSE="public-domain sun-concurrent-util MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND=">=virtual/jre-1.2"
 DEPEND=">=virtual/jdk-1.2"
diff --git a/dev-java/constantine/constantine-0.7-r1.ebuild b/dev-java/constantine/constantine-0.7-r1.ebuild
index b1e08eb8b8c8..2f8036f0a32f 100644
--- a/dev-java/constantine/constantine-0.7-r1.ebuild
+++ b/dev-java/constantine/constantine-0.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/wmeissner/jnr-constants"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
index b70bc3d674a0..9a8ab3fa2b98 100644
--- a/dev-java/cortado/cortado-0.6.0-r1.ebuild
+++ b/dev-java/cortado/cortado-0.6.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.xiph.org/releases/cortado/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index 6c7bee409ebd..8575d20c7fa4 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
index 10b2a16f5679..6aabe1b59766 100644
--- a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
+++ b/dev-java/dbus-java/dbus-java-2.7-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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus-java/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="debug"
 
 RDEPEND=">=virtual/jre-1.5
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
index c43214986be8..568af2424bc9 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="
diff --git a/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild b/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild
index 186a075f94bb..fe50b658fff3 100644
--- a/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild
+++ b/dev-java/dsiutils/dsiutils-1.0.10-r2.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,7 +14,7 @@ SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/dtdparser/dtdparser-1.21-r2.ebuild b/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
index e86238f67644..95f3c8c63d5f 100644
--- a/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
+++ b/dev-java/dtdparser/dtdparser-1.21-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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.wutka.com/download/${P}.tgz"
 
 LICENSE="LGPL-2.1 Apache-1.1"
 SLOT="${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
index aae38ba8b147..a356bc78b72b 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="3.2"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
index f972c2e690c9..ea32b92ca509 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-
 
 LICENSE="EPL-1.0"
 SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+native"
 
 RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
index b52411139980..5b341dfe7064 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-
 
 LICENSE="EPL-1.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="+native"
 
 RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
index 9b8687c05489..aad4902843c8 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.2.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src
 
 LICENSE="EPL-1.0"
 SLOT="4.2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="+native"
 
 RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
index 6b3405c76e98..e10c74481229 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src
 
 LICENSE="EPL-1.0"
 SLOT="4.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="+native"
 
 RDEPEND="sys-devel/gcc:*[gcj]
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
index d10c95b7c558..3d6a3fcff8c0 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.7.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$
 
@@ -14,7 +14,7 @@ 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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="3.7"
 IUSE="+ant userland_GNU"
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
index a5826b335fde..179db679c99c 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.2"
 IUSE="+ant userland_GNU"
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
index 5eed5489c313..e5808065c913 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.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 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.4"
 IUSE="+ant"
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
index a690ae14a28c..07813096d1a2 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.5"
 IUSE="+ant"
 
diff --git a/dev-java/edtftpj/edtftpj-2.0.4.ebuild b/dev-java/edtftpj/edtftpj-2.0.4.ebuild
index 168d6dc0c43b..f462230d2e6e 100644
--- a/dev-java/edtftpj/edtftpj-2.0.4.ebuild
+++ b/dev-java/edtftpj/edtftpj-2.0.4.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,7 +14,7 @@ HOMEPAGE="http://www.enterprisedt.com"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/junit-3.8*"
diff --git a/dev-java/emma/emma-2.0.5312-r2.ebuild b/dev-java/emma/emma-2.0.5312-r2.ebuild
index 66b1fc1ef323..b899858fa5f6 100644
--- a/dev-java/emma/emma-2.0.5312-r2.ebuild
+++ b/dev-java/emma/emma-2.0.5312-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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd"
 
 IUSE="+launcher"
 
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
index 02b4efc784ba..2ad3fb127b75 100644
--- a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-1.2.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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/sun/xml/${PN}/${MY_P
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/fastutil/fastutil-4.3.1-r1.ebuild b/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
index 6759ceacf797..3ef42cdaa64d 100644
--- a/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
+++ b/dev-java/fastutil/fastutil-4.3.1-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$
 
@@ -11,7 +11,7 @@ SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
 HOMEPAGE="http://fastutil.dsi.unimi.it"
 LICENSE="LGPL-2.1"
 SLOT="4.3"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/fastutil/fastutil-4.4.2-r1.ebuild b/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
index 903af50feaee..383af347025b 100644
--- a/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
+++ b/dev-java/fastutil/fastutil-4.4.2-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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://fastutil.dsi.unimi.it"
 LICENSE="LGPL-2.1"
 SLOT="4.4"
 IUSE=""
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/fastutil/fastutil-5.1.3.ebuild b/dev-java/fastutil/fastutil-5.1.3.ebuild
index 4c8f21c6bd3b..9f8192fa8be6 100644
--- a/dev-java/fastutil/fastutil-5.1.3.ebuild
+++ b/dev-java/fastutil/fastutil-5.1.3.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://fastutil.dsi.unimi.it"
 LICENSE="LGPL-2.1"
 SLOT="5.0"
 IUSE=""
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/fastutil/fastutil-6.5.4.ebuild b/dev-java/fastutil/fastutil-6.5.4.ebuild
index 0dea5bc60e73..a8f0dd74fdac 100644
--- a/dev-java/fastutil/fastutil-6.5.4.ebuild
+++ b/dev-java/fastutil/fastutil-6.5.4.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,7 +14,7 @@ HOMEPAGE="http://fastutil.dsi.unimi.it"
 
 LICENSE="Apache-2.0"
 SLOT="6.5"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/fontbox/fontbox-0.1.0.ebuild b/dev-java/fontbox/fontbox-0.1.0.ebuild
index bd0591b57ca5..7b499d934a40 100644
--- a/dev-java/fontbox/fontbox-0.1.0.ebuild
+++ b/dev-java/fontbox/fontbox-0.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 
 IUSE="doc source"
 
diff --git a/dev-java/fontbox/fontbox-1.7.1.ebuild b/dev-java/fontbox/fontbox-1.7.1.ebuild
index a76a66d439a7..59c837243658 100644
--- a/dev-java/fontbox/fontbox-1.7.1.ebuild
+++ b/dev-java/fontbox/fontbox-1.7.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="BSD"
 SLOT="1.7"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/fop/fop-2.0-r1.ebuild b/dev-java/fop/fop-2.0-r1.ebuild
index 826c826ef09a..2b2229af27d0 100644
--- a/dev-java/fop/fop-2.0-r1.ebuild
+++ b/dev-java/fop/fop-2.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$
 
@@ -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 x86 ppc ppc64 ~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/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
index af0e1c707697..3c9485add707 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 ~ppc ~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/freemarker/freemarker-2.3.13-r1.ebuild b/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
index 1921439a5990..2aa20695b34a 100644
--- a/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.13-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="freemarker"
 SLOT="2.3"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/freemarker/freemarker-2.3.13.ebuild b/dev-java/freemarker/freemarker-2.3.13.ebuild
index 34fae4fb5449..73e51c2c30fb 100644
--- a/dev-java/freemarker/freemarker-2.3.13.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.13.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,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="freemarker"
 SLOT="2.3"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/javacc
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.3.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.3.ebuild
index f0a4369a4398..54e4b391089b 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.9.3.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-linux"
 SLOT="0"
 IUSE="awt"
 
diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild
index 66f4a2edf2e9..bed1537c92c6 100644
--- a/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild
+++ b/dev-java/gjdoc/gjdoc-0.7.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/classpath/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 # Possible USE flags.
 #
diff --git a/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
index 17fa1d83d0f3..0b081faa2463 100644
--- a/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
+++ b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
 
 LICENSE="|| ( CDDL GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
index 1c8205d57693..ac1857166ef6 100644
--- a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
+++ b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/${
 
 LICENSE="|| ( CDDL GPL-2 )"
 SLOT="1.2"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
index 5d5b52e02af0..8e128bbaf30c 100644
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
@@ -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 @@ HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
 SRC_URI="http://central.maven.org/maven2/org/glassfish/javax.servlet/${PV}/${MY_P}-sources.jar"
 LICENSE="CDDL"
 SLOT="3.1.1"
-KEYWORDS="amd64 x86 ~ppc ~ppc64"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
index 0cd168f3bf88..0ce9d952f1a1 100644
--- a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
 
 LICENSE="|| ( CDDL GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE=""
 
diff --git a/dev-java/glazedlists/glazedlists-1.7.0-r1.ebuild b/dev-java/glazedlists/glazedlists-1.7.0-r1.ebuild
index 48a85df039ae..8cb1d5c484f8 100644
--- a/dev-java/glazedlists/glazedlists-1.7.0-r1.ebuild
+++ b/dev-java/glazedlists/glazedlists-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_DOCUMENT_ID_JAVA5="1073/38679"
 SRC_URI="https://${PN}.dev.java.net/files/documents/${SRC_DOCUMENT_ID_JAVA5}/${P}-source_java15.zip"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 # TODO: there are extensions, some supported in the java-experimental ebuild
 IUSE=""
 
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
index 67c9eb8c5edb..b8a98f6c0932 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/classpath/"
 SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1.0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/gnu-crypto-2.0.1"
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
index 4b1db498e316..446635f90145 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/classpath/"
 SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1.1"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/gnu-crypto-2.0.1"
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
index e252411ddb06..f48e7901e2fb 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0.98"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk gstreamer qt4 xml"
 REQUIRED_USE="doc? ( gjdoc )"
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
index cb10b1dc54e3..20d78cb46552 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.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$
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
index a68ea4924b07..b5a43375fc97 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-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$
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.gnupg.org/GnuPG/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
index fedf74cf962a..86c913d62296 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild
index 1d1e775befaa..7973624c019a 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.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$
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tralfamadore.com/pub/java/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/groovy/groovy-1.7.5.ebuild b/dev-java/groovy/groovy-1.7.5.ebuild
index 4588cb70d709..8c2decd8bd7d 100644
--- a/dev-java/groovy/groovy-1.7.5.ebuild
+++ b/dev-java/groovy/groovy-1.7.5.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$
 
@@ -28,7 +28,7 @@ HOMEPAGE="http://groovy.codehaus.org/"
 SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
 LICENSE="codehaus-groovy"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/dev-java/groovy/groovy-1.8.5-r1.ebuild b/dev-java/groovy/groovy-1.8.5-r1.ebuild
index d1ea5224951e..bd4c6187cf21 100644
--- a/dev-java/groovy/groovy-1.8.5-r1.ebuild
+++ b/dev-java/groovy/groovy-1.8.5-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$
 
@@ -28,7 +28,7 @@ HOMEPAGE="http://groovy.codehaus.org/"
 SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
 LICENSE="codehaus-groovy"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/dev-java/groovy/groovy-2.4.5.ebuild b/dev-java/groovy/groovy-2.4.5.ebuild
index d6d53f01fc77..5c533dd8598b 100644
--- a/dev-java/groovy/groovy-2.4.5.ebuild
+++ b/dev-java/groovy/groovy-2.4.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$
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.groovy-lang.org/"
 SRC_URI="https://github.com/apache/incubator-${PN}/archive/${MY_P}.zip -> ${P}.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild
index e048dc3f9ba2..c8d68f36fa0a 100644
--- a/dev-java/guava/guava-13.0.1-r3.ebuild
+++ b/dev-java/guava/guava-13.0.1-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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
 
 LICENSE="Apache-2.0"
 SLOT="13"
-KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/jsr305:0
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
index df5eb8d8f136..669a3f91cdb6 100644
--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
 
 LICENSE="Apache-2.0"
 SLOT="18"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/javax-inject:0
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
index bd62ec916206..bd539febb91c 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hamcrest"
 SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
index b9d9640cc48a..7e45df81b529 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-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$
 
@@ -18,7 +18,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND=">=virtual/jdk-1.5
 	~dev-java/hamcrest-generator-${PV}
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
index 8590bbd39c5a..07107a473e18 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.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$
 
@@ -18,7 +18,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd"
 
 CDEPEND="dev-java/qdox:1.6"
 
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
index 1be6558cb8af..2f906d07e8af 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-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 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
 
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
index 51ec8db2597c..1cd24a7e7dc3 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/hessian/hessian-4.0.37.ebuild b/dev-java/hessian/hessian-4.0.37.ebuild
index 92bae327b85d..3f1b79549d65 100644
--- a/dev-java/hessian/hessian-4.0.37.ebuild
+++ b/dev-java/hessian/hessian-4.0.37.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://hessian.caucho.com/download/${P}-src.jar"
 
 LICENSE="Apache-1.1"
 SLOT="4.0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
diff --git a/dev-java/higlayout/higlayout-1.0-r2.ebuild b/dev-java/higlayout/higlayout-1.0-r2.ebuild
index f870ed7646ab..b75d00f76774 100644
--- a/dev-java/higlayout/higlayout-1.0-r2.ebuild
+++ b/dev-java/higlayout/higlayout-1.0-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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.autel.cz/dmi/HIGLayout${PV}.zip"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/hoteqn/hoteqn-4.0.0.ebuild b/dev-java/hoteqn/hoteqn-4.0.0.ebuild
index d0385f5d6eed..f8dd2c301815 100644
--- a/dev-java/hoteqn/hoteqn-4.0.0.ebuild
+++ b/dev-java/hoteqn/hoteqn-4.0.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$
 
@@ -9,7 +9,7 @@ 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 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild
index b0dd4401edf8..b67dbdaeaf36 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.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$
 
@@ -94,7 +94,7 @@ SRC_URI="
 		ppc64? ( ${PPC64_JAVACOMM_DIST} )
 	)"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* amd64 ppc ppc64 x86"
+KEYWORDS="-* amd64 ppc64 x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
 
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
index a6332978c653..b23969e07ab8 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-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$
 
@@ -65,7 +65,7 @@ SRC_URI="
 
 LICENSE="IBM-J1.6"
 SLOT="1.6"
-KEYWORDS="-* ~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
 
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild
index d97b3f72b9a4..cafcb3526d69 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.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$
 
@@ -94,7 +94,7 @@ SRC_URI="
 		ppc64? ( ${PPC64_JAVACOMM_DIST} )
 	)"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* amd64 ppc ppc64 x86"
+KEYWORDS="-* amd64 ppc64 x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
 
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild
index a8c295491923..9bdb54b860fc 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.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$
 
@@ -60,7 +60,7 @@ SRC_URI="x86? ( ${X86_JRE_DIST} )
 	ppc? ( ${PPC_JRE_DIST} )
 	ppc64? ( ${PPC64_JRE_DIST} )"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* amd64 ppc ppc64 x86"
+KEYWORDS="-* amd64 ppc64 x86"
 RESTRICT="fetch"
 IUSE="X alsa nsplugin odbc selinux"
 
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
index d0da10048cda..e079f5da9684 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-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$
 
@@ -39,7 +39,7 @@ SRC_URI="x86? ( ${X86_JRE_DIST} )
 
 LICENSE="IBM-J1.6"
 SLOT="1.6"
-KEYWORDS="-* ~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa nsplugin odbc selinux"
 
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.ebuild
index 2edd0fbf950f..872d6630426c 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.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$
 
@@ -60,7 +60,7 @@ SRC_URI="x86? ( ${X86_JRE_DIST} )
 	ppc? ( ${PPC_JRE_DIST} )
 	ppc64? ( ${PPC64_JRE_DIST} )"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* amd64 ppc ppc64 x86"
+KEYWORDS="-* amd64 ppc64 x86"
 RESTRICT="fetch"
 IUSE="X alsa nsplugin odbc selinux"
 
diff --git a/dev-java/ical4j/ical4j-1.0.5.ebuild b/dev-java/ical4j/ical4j-1.0.5.ebuild
index 1ae24297ff55..02e22f68b813 100644
--- a/dev-java/ical4j/ical4j-1.0.5.ebuild
+++ b/dev-java/ical4j/ical4j-1.0.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 COMMON_DEP="
 	dev-java/commons-logging:0
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 8080c9544807..8ea6502bae2b 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,28 +1,16 @@
-DIST icedtea-bin-core-6.1.13.8-amd64.tar.xz 49241032 SHA256 4712f3844d1a56ac545b01cdbc76c9e315480ace3120a99b22e5d904091c8b3e SHA512 5cfff7ff5a0d0b4eef382620e98849c318df342a23ea0bb5764b4032ca7a96a86e67991ad97ec95b35786be0e3ac7a39990104e12ea47cc50c1c7326e933feb2 WHIRLPOOL 2e992d99675095aad1b74492d02f3c1fb393bf9bb1d496ace2036c0a40dbe2b1605783a84131fc5c15aa06834605d1ae962e7fee45556b41176cde54f1357273
-DIST icedtea-bin-core-6.1.13.8-r1-ppc.tar.xz 39586112 SHA256 782019d78fba6562170382fcbe5fff4fca5feaffef442ceabc93e3b4ed40c035 SHA512 81b678673bae9fb07b9aa4ccc98fb6d3132ace2f776c224510787def831ca765bfd8dbea875ae8049f564268952459a692db1125e9f37eccb6ff3684511fc648 WHIRLPOOL ff9400b7d65b9b3661b679ebad6747b9d3a2de882bc1c281565a6220ca0ef45a8abb6c9b2d1db64f491d55d173dd017780514b2b685ec5d3ce7c5e25cec08c46
-DIST icedtea-bin-core-6.1.13.8-x86.tar.xz 49676360 SHA256 495171e826414051670fade7ac7af2705b3ecc01ba2ef3e63790cd24ec4fe7b5 SHA512 56cd90d21e30f2451f7206b84d80ed0d227f750f7e9155f2401e12ea4b9bbcdd882abbb01cade21e0bfcc05318552bd1e6102cc78aa601654179058f595ca68a WHIRLPOOL 6eabeca6006f84d912686ecd5921466cc5a7f3308b192e3ad9d4cee7a54356923a0c720e8d3d083533ab7b4baea839ed8247db2d1ee43dcd989ed312ff139323
 DIST icedtea-bin-core-6.1.13.9-amd64.tar.xz 49472280 SHA256 3faf62158a33cf1021f63f137a5b35c1c04bc4366d40d7288a6745911bf15034 SHA512 237266a1843b5d1ed0b4553fa36e88d7dce7f6a9bf6e13277d38bc83bb85cfac9b031ed5b362e73e5bc24464893cfdb37bfe67fcf3d4e218a87f101ab56afae7 WHIRLPOOL dd067ee66e2ce7ebbf08d4187d4699198d9759d6571c7d3bf127b7c8ff3a8eb1bea48bf45ed5d480df8de7320ab4f9a00ed6608935f2b3b794a99141568aa57a
-DIST icedtea-bin-core-6.1.13.9-ppc.tar.xz 39644200 SHA256 c91ca06361bb533b24a9850339e6a55c9f73e3d758483ed9251aa91638507d72 SHA512 c23bb2fcab5090344d7a8510375ca6c0a5c64b639e23e1f3d281ce0f671934c8cf9d02b3ac0550453da123601095b2850dcf4172d1fed8541ff2bddf2806cf6c WHIRLPOOL b9009309aa050f3084cc89c4c497fccb8dc188b0ebfce269a845032ad8d372e7a6003deb402b849897d823ec5620e9cb2a61168de9fb4b2739dc9fd2ec4c5bd4
 DIST icedtea-bin-core-6.1.13.9-x86.tar.xz 50947228 SHA256 fbef618f82fc640553bf69383ddf6a4ffb4da5191426d040f0186538fdb3ab2f SHA512 04a066493a0e742da0508fa7e010e7663e73a48e0663939884d22a2f7fa4d440d3680f6a38d7909b2b2f569bbd35facabe838a275cdd589556570601484d443c WHIRLPOOL 9e144546554bf0de5c7cc280fe20a3cd97554d0745b071d0c3f5f97a394556c71246423a39d10de207d0058889ddc010fd367813f4d10fe888d49924b4d7bac7
 DIST icedtea-bin-core-7.2.6.3-amd64.tar.xz 52999776 SHA256 565383f7cecedf740e9ca0f0c98921cef04f5ccb754d9a4591f98b75a6b6d616 SHA512 9299a9f62fb1a05688523ff4a48ab28a2fd1d16bb8a9984dfc203d919e7e49e733792b9f5aa9852867e8542a422327c235a03fb850b20d38877d0048ccfb6420 WHIRLPOOL 657cf42fdff2a40f8acaa9fe1ea0c7a29d28799943f92418636ec76dd82ed658dfb628596d01c4d432220bfdc0f0f4c4dc247181a5e17cdb198d2edf09b61bb1
 DIST icedtea-bin-core-7.2.6.3-arm.tar.xz 43980964 SHA256 bfc50f27b063461e2382da6f480bdc24a498feb3eba3c368912239ef176a384c SHA512 2d3aa682c20a6abd200263e15f0a7cb7f2ee3bdd52db6eff5d1d3676f286c3ed356ed9ca71041ad9514ca4684ab84f52c7df2a94bb112c99e34477a225f57a20 WHIRLPOOL 1c2139fe5b2da957ac64fdf9214cd2c62b55591f7c535b6ff287d0da20b7f9e6e19f5d93d816cb4346ec3746491a30b5b080184132669bd0a90d7f0ac3fa0da3
-DIST icedtea-bin-core-7.2.6.3-ppc.tar.xz 42890632 SHA256 5524cc47fdb1e8c4c5b6f5926b71835b74e6a0ba1e9f7deb3ddef8a2896f27f2 SHA512 808771fa6379ee564f45737d019493d552508b8b5555a6ac512606a99fc0f0943210abef628494a50144d799d821091060244e63c0c410d530937156c6540d0c WHIRLPOOL a205c711c2a96dd985c48f2dfcb57041887e6243b465bca2f7665d153c6f9da1bae4668bbb102e20f73b81fa3edcf95dd51c9287f0df04fb48c6c98d3c9fed2e
 DIST icedtea-bin-core-7.2.6.3-ppc64.tar.xz 42984708 SHA256 8d0723accf8cb0258504581dd6663200bc89917ef3a8950f542c9a80eea4f96f SHA512 4557909277fb2ef74c7fc4882dc07ce161ef8e1e1b5c672a72a3ca095c409273a4fda521c7d2f5241939c2f1124857ec3bbf84dce67a34b0ad47e3aafbc896fd WHIRLPOOL fada9dc621792549d4a8622fbfa6ecc693cc02aeb7c191efbfe816c6e71d2174823f2e9cea5b57aa4a8ff49e176bbed45de5f4fecac09b0881ccd0c635e0c3ec
 DIST icedtea-bin-core-7.2.6.3-x86.tar.xz 54651304 SHA256 3fc4faf7a9370cb0155df3c650eb36096c9430e38b3904e535027d823234043c SHA512 3ad55d66839c4cde86b44826ef8ba0ef1565cf9af9386cc327ef2b5476ddd954c519f925885e156ac87d4c606b0fd00ebaf8c8987c8b4fd81e789713a2ba3ef7 WHIRLPOOL 43df9b60ec270eb4a750299beeae316026d27b8ddf1e2246c5ce711f7d1f6f297b710b7cbf481d887fffa44a1a59f36997af7c52722a06d6c4e4ea1cf5b33208
-DIST icedtea-bin-doc-6.1.13.8.tar.xz 9844756 SHA256 71cffd016040d28366f8e50c983ca55a3af1d7b08a56c501838b78fc0d1837c1 SHA512 36a0691ad720869c2855345bd20dcccd60e7adfa90c511d829131997e9e995ab929a2f24955955b638b21672912a39774deacf72ee3390ae41e3d44e58eea5eb WHIRLPOOL 11892894ddae46a6f999e8e835a5d428fcb86643c20f44639d8b692090468ddecfdd7db4cebef0c422983950cfaf6d337b540effef64c6fb1f7d58ffd2e069e7
 DIST icedtea-bin-doc-6.1.13.9.tar.xz 9853020 SHA256 94ff85ba64be5c8cfcf261cb6293e48cc3239c1c9da69e98fbc744a82620bd16 SHA512 501d483dccfc349c6dd8a55f9d509d2859774054be9b9ca8020a75e3975d740d78d40184aa86f16b5ea948e16b74944ce4d890396d8ccb5209f7a9514a8b649a WHIRLPOOL 751afbb1e0e2384419424d9ae093893c2e377c004c69d0e06979385823f743ee33321b3c3076e0c8e0b16625a159293d81f959455ca6ee779dfdfa5fc5361907
 DIST icedtea-bin-doc-7.2.6.3.tar.xz 10604044 SHA256 7e43108f95991600d58f85ce44480d5702cfc6951d0cc096e1321852997acc5b SHA512 35688e7a19620ef7d4890ee9058b6f49f76b5ba67b5f1038cc9a53b7c50224eaec599baf6fc9e9bc4cc5b49e13c0dd05d5d14043b4d291caf237e9cd5a7e31fa WHIRLPOOL 9a6d3e3ad62f1cd5a4435dc1e1cf3943cb752898c3ba61b149be38603cb8746ad88b68e3e3812a449d65ccb4b9d8da211c07bc503044efe5849a35188944ad2b
-DIST icedtea-bin-examples-6.1.13.8-amd64.tar.xz 1904080 SHA256 29c2933d4fc4c7e240c7406d403a2667a42c5a3faee82413d2255d7dccea6873 SHA512 84771c52b816f4d3f065871df83bdd05408b69941c807de0bdc7ea423cff436878aa58dd5d61cb1bfae35cb37e56e2b5d29be6f6073a744e6af2125d66578713 WHIRLPOOL a08c748dd757c5927abd65088b0961d2dfb716030cc07e64589e5394a434123cb018630766e0223c6578ceb7f67ee0a68f5b2a548b1c9f701a5cc13732b84ecc
-DIST icedtea-bin-examples-6.1.13.8-ppc.tar.xz 1889932 SHA256 62bc68f31b1118d890c2add87a4d14663b0595aeb5fdfd8d904a59a19c4ed7f4 SHA512 22d38c9efa794165e1ecdb8cabb1ecaf8b9c27027cf28562721789c33c1a714e3d226b95a8c5420ff48a769c869ef09c575e76e8995f089037263ddfd72d21c5 WHIRLPOOL 031a8ffb8609028d089d047f1324352db90ef72be951bcedc158f671f2930c4ae5087e65e53ec59e4457a9e09b40ad6848b980b63e3494e0d1dd70721e6e640e
-DIST icedtea-bin-examples-6.1.13.8-x86.tar.xz 1902616 SHA256 cd74d0b8056f7373f370ca62388c2e44786c3b68dccbf30cb9a3bc8ecc8353e4 SHA512 babcc73227115e19fe50b16f79f09e3a35d0c60de44823c3f6617c7276ff4b9efbfb5f03f1149948d4005524b3a136e74b0049a292d83ddf763626fc179d1883 WHIRLPOOL 6621c65b3f871cdc0769dd5361d7a4a17c56f5ca8eb2de1f4abc79ca6343784a5a43834e4906f4d371144615a3b3ed6db44370dc0950508d327587bf2e770ed2
 DIST icedtea-bin-examples-6.1.13.9-amd64.tar.xz 1904980 SHA256 aa10b253ba35e14d83852c80999c04bfee7c6ffee7b1baa9df502e253a6a87a1 SHA512 f9be25093aed5b762a268a5fc2cd943fa010bab469e1fd0cc9c39c927a9a154041e637036bfa804cc826f1c674b661ee6d4a5dd7d29820df1de4390db403a229 WHIRLPOOL 121122c84abe3ddbddf5faf6e163ce9a34331cdddfc8cd0ca746d8ba94a79af31c1dadba711aa4bb709edd91605d81785de4fe4ff1e3edd526d4aff592b18816
-DIST icedtea-bin-examples-6.1.13.9-ppc.tar.xz 1891664 SHA256 e5a28cb2cbd1f8720f194567039595062bace09ac7b8384c426db065775f8b34 SHA512 3deca264999bbe4a88359f8150267aff6510313fc4e14c19260c16fd98dbc8aff3aa08c5a4451c6390e933f7c9a3c34594f9c9d776634a21ef3df5845bb39029 WHIRLPOOL 9f1cea1241d4c0ddeed19dac84ed42309446a05eb1b58be9414a1c55928dbd9dc7d5567231ec6bceb46365e65d3b736ceb20eb37155504248038fe048a4cdcb2
 DIST icedtea-bin-examples-6.1.13.9-x86.tar.xz 1904548 SHA256 1aaaaa4ba6c37b5f03ecea8a978c9bdac371e5891dd02459cd7f4174286b182a SHA512 fcdae8dc62376f60a19a3de1fbba867fcbcaa069b5d669120e53d1792119a147566ce59e3e3205ca1db0afea3e6809f339a4a443ff0d21cb1a7c4aa8eb5060df WHIRLPOOL 5625b1af755e79c1e4360ac3fcbf786664525c9508f6fe902788f95a1be9b94d429a61ef0e475fa9d0e2c4ea386fe251a299305961e7936f932c8e2c0abcaa3e
 DIST icedtea-bin-examples-7.2.6.3-amd64.tar.xz 1796572 SHA256 bdbe018716fa955df5dfea56c1321698033debed7a29fe03650b0cdc5c7e6da3 SHA512 d6e1b5a93dde61bb0d7ebd7a06e7a326e94423ad362e0b9956d5eeb37197f716d5db7bbd6fbc32a1906089953a83a77ebc2ee99cedcfd9e7944e48ec3865e0fe WHIRLPOOL 0e728e3cdc1e33d264bfb3b5f54bbe4bd3ec64a19b0bc3047dc65c99cc45009fef9d8eab94761100ce84919379e5890e96c54965e840c5f10eb102a4df03767a
 DIST icedtea-bin-examples-7.2.6.3-arm.tar.xz 1779684 SHA256 78e068da88739404332cb50588229d236709f0adfe00596405c80c8a10f03d3a SHA512 a854095d3ee23db768ce9d1dff8bcd1598523a65af82ee6654b9ba464436d9f5d88208fe6879c1ea5140f30fca4f31e8dd5212b781722608c535d951c9670feb WHIRLPOOL 8dc1a49eb6a8bff49690d64384e9ffbd51725882aeca064419a69ff9ec82f624c6a16023b1930f16806189b0a89a70f3339ca653d3abc5335850205129b13d01
-DIST icedtea-bin-examples-7.2.6.3-ppc.tar.xz 1786900 SHA256 769e085fb3c64b41083c4a3335c3f6cdff41bb3502526784937a77551dc5492c SHA512 5db45bc9b3d5e59260d5fd319333e91467520291f131432f649cb064a9d892e4f4962bd0aef37ff3401eb051964d9d6311f8d20c9d1ae77a25e1020930544dde WHIRLPOOL c46e3bf017498cf51968799d10c67f1e72883e2c59941695a2cfe1f6135011ff8dcd27cf5d6b5e562d425572c4300bb8d28ab1b95101e42fa21888cab54247d5
 DIST icedtea-bin-examples-7.2.6.3-ppc64.tar.xz 1790340 SHA256 33b1f32e1b88469d1a8d37516825b0ec4eaa4645e205c2d4e669a4e6bc2c3449 SHA512 02ac15c513d2c870c7bafc5f18720bce4b7bdc84f3a7eaa64ce27094af5357a76211dbc6674a482c0ebc083da5ede2a79cfe2b1964477401aa508c3eebfd2a3a WHIRLPOOL 34090707fb04daed9993b5873bd5b71d2fec2cabdbf33ed8cd08540255a2edd07d16556bf8c4cece762c3d83856ec00254682eb316bd4ac9c848bc165bb2192f
 DIST icedtea-bin-examples-7.2.6.3-x86.tar.xz 1796668 SHA256 3f7d09d5f7b3dd45e9555c7653adf450b74c24eed8e91d4c6829cd084eaf1894 SHA512 d1bc7800bded733e69573694d8cb18cf352a633c36f336ff40fe8e4cde42f390dcac54a08945926eb0c17591574bf8eb7861977cbfaeb9b8eff7c2e7cef036d3 WHIRLPOOL a324137216a623749f8a1de904dd5cddb481b92c7286c365fb1f7d95682044674a2267d23e660cb804e071eecec3c6baea63ce75c0b97c0caed0afae1b2a7761
-DIST icedtea-bin-src-6.1.13.8.tar.xz 39773388 SHA256 c01deb2ef8ed9cf58284538e9f52651ff70b8349ec001f13314d69137f99ff4b SHA512 dba0cc027f3ed7589c7cb0ba7d9f1a401ef47a20a5ff502ad7e9b27d0f552a77f28ebbd9032d191ba3ac441955545b632d6fb242f67bc590a5f1a8d855b89ad8 WHIRLPOOL 6b835a7a6123a3843bd74506e52befafbc4792e792798660829d75ede09f6c283933d30d51ba01c87a16095b9faa1795bfec6539cb55709032e22d6395566d19
 DIST icedtea-bin-src-6.1.13.9.tar.xz 39778948 SHA256 11ed522199d3919f7013f4d3d4fb2324d4505ca60fdbcb015faf635c4dfcfc70 SHA512 4c02e7368ed21882afe68cbba3475a16a30276110282d28984586f1c1e0c3d14278e70e495fc74676ba57df3849b8f60ea24da49c6f41070319c46962f1a221a WHIRLPOOL b6daed3717d434688e8946976d96857ce904d510cb45fc30b464e86d1c123ccb2a81ee07bea432ad6fb5148d1b0a73bebe7f51a0bc2f5b1308701a4fce436d79
 DIST icedtea-bin-src-7.2.6.3.tar.xz 40039304 SHA256 eb8a7e7dd567934a274f496640d984792731ca1192f2fd415a4d6597a282b8b8 SHA512 f02778176bdf524a954689576272ea4af8d77e6dacdab05edb8bc0ff2db43ae2d63635b07ae88f8f9d88797c4b9f28c4d24341c8e10a0f7841bae1b6775b97e4 WHIRLPOOL b9603cbaeb9528288b18225323f97635efd7a434d4a9fb45ceb1abfa2d93c1cc1fc212187448a8ed3cb074d657736537b5e175ca82749c8cb04cf085f16a162b
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild
deleted file mode 100644
index 4ff8ac9b8e56..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-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"
-
-inherit java-vm-2 prefix versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 ppc x86; do
-	SRC_URI+="
-		${arch}? (
-			${dist}/${PN}-core-${TARBALL_VERSION}$([[ ${arch} = ppc ]] && echo -r1)-${arch}.tar.xz
-			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
-		)"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="-* amd64 ppc x86"
-
-IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin selinux source webstart"
-REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND="media-fonts/dejavu
-	>=media-libs/freetype-2.5:2
-	>=media-libs/lcms-2.6:2
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg:62
-	alsa? ( >=media-libs/alsa-lib-1.0 )
-	awt? (
-		>=media-libs/giflib-4.1.6-r1
-		media-libs/libpng:0/16
-		>=x11-libs/libX11-1.6
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.7
-		>=x11-libs/libXrender-0.9.4
-		>=x11-libs/libXtst-1.2
-	)
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( >=net-print/cups-2.0 )
-	gtk? ( >=x11-libs/gtk+-2.24:2 )
-	selinux? ( sec-policy/selinux-java )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
-	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-src_prepare() {
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if [[ -n "${EPREFIX}" ]]; then
-		# The binaries are built on a non-prefixed system. The binary
-		# "bfc" fontconfig therefore must be replaced with a plain text
-		# "properties" fontconfig. The "src" file that accompanies the
-		# "bfc" file can be used as a template.
-		rm -v jre/lib/fontconfig.Gentoo.bfc || die
-		mv -v jre/lib/fontconfig.Gentoo.properties{.src,} || die
-		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-		eprefixify jre/lib/fontconfig.Gentoo.properties
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	# doins doesn't preserve executable bits.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		cp -pRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
-		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
-		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild
index ddd94f3ebed1..09fdf402dfd3 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
 
-for arch in amd64 ppc x86; do
+for arch in amd64 x86; do
 	SRC_URI+="
 		${arch}? (
 			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
@@ -24,7 +24,7 @@ done
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
-KEYWORDS="-* amd64 ~ppc x86"
+KEYWORDS="-* amd64 x86"
 
 IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin selinux source webstart"
 REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
index 1825a681fb89..e07e771a9667 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
 
-for arch in amd64 arm ppc ppc64 x86; do
+for arch in amd64 arm ppc64 x86; do
 	SRC_URI+="
 		${arch}? (
 			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
@@ -24,7 +24,7 @@ done
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"
 
 IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
 REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
index c166af6fada8..cd849a1992b7 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
 
-for arch in amd64 arm ppc ppc64 x86; do
+for arch in amd64 arm ppc64 x86; do
 	SRC_URI+="
 		${arch}? (
 			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
@@ -24,7 +24,7 @@ done
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="-* amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="-* amd64 ~arm ~ppc64 x86"
 
 IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
 REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
index 5a29f20df1b5..3bee09bad6ec 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-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$
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -13,7 +13,7 @@ SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.xz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 IUSE="+doc test"
 
diff --git a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
index dd000c725511..3a658666243d 100644
--- a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
@@ -12,7 +12,7 @@ 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 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc +icedtea7 javascript nsplugin tagsoup test"
 RESTRICT="test"
 
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
index 695a064b9f75..0a3c79c24e78 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="doc javascript nsplugin tagsoup test"
 RESTRICT="test"
 
diff --git a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
index 3ee8a107a807..4d4f4dc50b77 100644
--- a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
index 7621ae171394..d68f4174148c 100644
--- a/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
@@ -57,7 +57,7 @@ SRC_URI="
 	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
diff --git a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
index be965e396d5c..2192b484771f 100644
--- a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
+++ b/dev-java/icu4j/icu4j-3.8.1-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$
 
@@ -21,7 +21,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.ja
 HOMEPAGE="http://www.icu-project.org/"
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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"
 
diff --git a/dev-java/icu4j/icu4j-4.0.1.1.ebuild b/dev-java/icu4j/icu4j-4.0.1.1.ebuild
index 8b0f07c55f65..6b0d3a0b01a6 100644
--- a/dev-java/icu4j/icu4j-4.0.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-4.0.1.1.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$
 
@@ -23,7 +23,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.ja
 HOMEPAGE="http://www.icu-project.org/"
 LICENSE="icu"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/icu4j/icu4j-4.2.1.1.ebuild b/dev-java/icu4j/icu4j-4.2.1.1.ebuild
index e352e3d129c4..6bad6ec71e3d 100644
--- a/dev-java/icu4j/icu4j-4.2.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-4.2.1.1.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$
 
@@ -23,7 +23,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.ja
 HOMEPAGE="http://www.icu-project.org/"
 LICENSE="icu"
 SLOT="4.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/icu4j/icu4j-4.4.2.ebuild b/dev-java/icu4j/icu4j-4.4.2.ebuild
index 0b826a0a37c2..b6ff03441ed1 100644
--- a/dev-java/icu4j/icu4j-4.4.2.ebuild
+++ b/dev-java/icu4j/icu4j-4.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$
 
@@ -23,7 +23,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.ja
 HOMEPAGE="http://www.icu-project.org/"
 LICENSE="icu"
 SLOT="4.4"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
diff --git a/dev-java/icu4j/icu4j-49.1.ebuild b/dev-java/icu4j/icu4j-49.1.ebuild
index 016b278b5863..c294201606bc 100644
--- a/dev-java/icu4j/icu4j-49.1.ebuild
+++ b/dev-java/icu4j/icu4j-49.1.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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="49"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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
diff --git a/dev-java/icu4j/icu4j-52.1.ebuild b/dev-java/icu4j/icu4j-52.1.ebuild
index d8cc7d3a4ccf..ecd0d4d48ea1 100644
--- a/dev-java/icu4j/icu4j-52.1.ebuild
+++ b/dev-java/icu4j/icu4j-52.1.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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="52"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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
diff --git a/dev-java/icu4j/icu4j-53.1.ebuild b/dev-java/icu4j/icu4j-53.1.ebuild
index 5e5a545b5455..6dea8784419e 100644
--- a/dev-java/icu4j/icu4j-53.1.ebuild
+++ b/dev-java/icu4j/icu4j-53.1.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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="52"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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
diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1.ebuild
index 9def3df16b04..f6edcc4d43df 100644
--- a/dev-java/icu4j/icu4j-54.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-54.1.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,7 +17,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="52"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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
diff --git a/dev-java/icu4j/icu4j-55.1.ebuild b/dev-java/icu4j/icu4j-55.1.ebuild
index c1788ad21683..d3da6dc459b4 100644
--- a/dev-java/icu4j/icu4j-55.1.ebuild
+++ b/dev-java/icu4j/icu4j-55.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="55"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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
diff --git a/dev-java/ini4j/ini4j-0.5.1.ebuild b/dev-java/ini4j/ini4j-0.5.1.ebuild
index e5e341bce539..de7cafc0b708 100644
--- a/dev-java/ini4j/ini4j-0.5.1.ebuild
+++ b/dev-java/ini4j/ini4j-0.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://central.maven.org/maven2/org/${PN}/${PN}/${PV}/${P}-sources.jar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/iso-relax/iso-relax-20050331-r3.ebuild b/dev-java/iso-relax/iso-relax-20050331-r3.ebuild
index b19426b755a4..b511ed21cf47 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r3.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-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$
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
index c71583c2037c..2e4893296e99 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.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://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/$
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild b/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild
index bcb2f766450f..7bdef4a21d64 100644
--- a/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild
+++ b/dev-java/istack-commons-tools/istack-commons-tools-2.22.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://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/$
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/itext/itext-2.1.5-r2.ebuild b/dev-java/itext/itext-2.1.5-r2.ebuild
index 86bafa80f428..8e77d4cc7d91 100644
--- a/dev-java/itext/itext-2.1.5-r2.ebuild
+++ b/dev-java/itext/itext-2.1.5-r2.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$
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/itext/${DISTFILE}
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cjk rtf rups"
 
 BCV="1.45"
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
index 6c4f9fa1a53d..c99a3a2609dd 100644
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ b/dev-java/jacl/jacl-1.4.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://tcljava.sourceforge.net"
 SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc"
 
 CDEPEND=">=dev-lang/tcl-8.4.5:*"
diff --git a/dev-java/jacoco/jacoco-0.7.5.ebuild b/dev-java/jacoco/jacoco-0.7.5.ebuild
index 033b0695ec92..c7dc86cb4040 100644
--- a/dev-java/jacoco/jacoco-0.7.5.ebuild
+++ b/dev-java/jacoco/jacoco-0.7.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$
 EAPI=5
@@ -17,7 +17,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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
index e86053895f1c..f548e278248c 100644
--- a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
+++ b/dev-java/jad-bin/jad-bin-1.5.8e-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$
 
@@ -8,7 +8,7 @@ DESCRIPTION="Jad - The fast JAva Decompiler"
 HOMEPAGE="http://www.kpdus.com/jad.html"
 SRC_URI="http://www.kpdus.com/jad/linux/jadls158.zip"
 
-KEYWORDS="amd64 -ppc x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="freedist"
 IUSE=""
diff --git a/dev-java/jade/jade-3.3-r1.ebuild b/dev-java/jade/jade-3.3-r1.ebuild
index e0fbca06f15f..881d15b3521d 100644
--- a/dev-java/jade/jade-3.3-r1.ebuild
+++ b/dev-java/jade/jade-3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-java/jade/jade-3.3-r2.ebuild b/dev-java/jade/jade-3.3-r2.ebuild
index d084610e8849..e867f7c82ce2 100644
--- a/dev-java/jade/jade-3.3-r2.ebuild
+++ b/dev-java/jade/jade-3.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$
 
@@ -18,7 +18,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-java/jaffl/jaffl-0.5.11-r1.ebuild b/dev-java/jaffl/jaffl-0.5.11-r1.ebuild
index fe2b74670f79..e1cdca4df0e6 100644
--- a/dev-java/jaffl/jaffl-0.5.11-r1.ebuild
+++ b/dev-java/jaffl/jaffl-0.5.11-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 @@ SRC_URI="https://github.com/jnr/jnr-ffi/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="
 	dev-java/asm:3
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
index af8dbd1c0f57..76eb246f8c21 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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.3"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild
index 49894e4193fa..9ab8a61e2a4a 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="1.3"
 IUSE="doc source"
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	source? ( app-arch/zip )"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
index 4069a12ee4e5..0b15f47ef2c6 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="1.3"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild
index b14ab153e2a3..407eb028b953 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="1.4"
 IUSE="doc source"
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	source? ( app-arch/zip )"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
index c550446bad34..8c7486c61c7f 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="1.4"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~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"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
index bcad094d1ee2..a7772c9fc46e 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/jal/jal-20031117-r3.ebuild b/dev-java/jal/jal-20031117-r3.ebuild
index 29882c675739..2f57c3147bee 100644
--- a/dev-java/jal/jal-20031117-r3.ebuild
+++ b/dev-java/jal/jal-20031117-r3.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 @@ HOMEPAGE="http://vigna.dsi.unimi.it/jal/"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
index ba985c995bf3..abaa7092341f 100644
--- a/dev-java/jama/jama-1.0.3-r1.ebuild
+++ b/dev-java/jama/jama-1.0.3-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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc ~ppc64"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index e6d9c12f03ec..6b6544a3d92b 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="debug libffi"
 
 DEPEND="dev-java/gnu-classpath:0.98
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
index 9e37c8008e98..de308b6f7e5a 100644
--- a/dev-java/jansi-native/jansi-native-1.5.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/${PN}/tarball/${P} -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/hawtjni-runtime:0"
 
diff --git a/dev-java/jansi/jansi-1.5-r1.ebuild b/dev-java/jansi/jansi-1.5-r1.ebuild
index 9eb6c5e1b3f4..60b266013cf6 100644
--- a/dev-java/jansi/jansi-1.5-r1.ebuild
+++ b/dev-java/jansi/jansi-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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 CDEPEND="dev-java/jansi-native:0"
 
diff --git a/dev-java/jansi/jansi-1.5.ebuild b/dev-java/jansi/jansi-1.5.ebuild
index 5b7e58f57c33..b5a9d335e900 100644
--- a/dev-java/jansi/jansi-1.5.ebuild
+++ b/dev-java/jansi/jansi-1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/jansi-native:0"
 
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index 81386bc1af1d..e3355cde8916 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.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$
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
 HOMEPAGE="http://jarjar.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 RESTRICT="test"
 
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
index 5da8d1a232f9..993c431c0f55 100644
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16-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$
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="!<dev-java/java-config-1.3"
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
index 094a6bec349f..7e8286f4bd77 100644
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16.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 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="!<dev-java/java-config-1.3"
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild b/dev-java/java-config/java-config-2.2.0.ebuild
index 0635431b0f4e..082aac1ee3a4 100644
--- a/dev-java/java-config/java-config-2.2.0.ebuild
+++ b/dev-java/java-config/java-config-2.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$
 
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 # baselayout-java is added as a dep till it can be added to eclass.
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index 87628b3b638c..3bc3b0cedad0 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/java-gnome/java-gnome-4.0.19.ebuild b/dev-java/java-gnome/java-gnome-4.0.19.ebuild
index 0f4e14d4219b..67893be29a0a 100644
--- a/dev-java/java-gnome/java-gnome-4.0.19.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.19.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="4.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.22
diff --git a/dev-java/java-gnome/java-gnome-4.0.20.ebuild b/dev-java/java-gnome/java-gnome-4.0.20.ebuild
index c6bc58fd6af3..59e2566a40e3 100644
--- a/dev-java/java-gnome/java-gnome-4.0.20.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.20.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$
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=dev-libs/glib-2.22
 	>=x11-libs/gtk+-2.22.0:2
diff --git a/dev-java/java-gnome/java-gnome-4.1.3.ebuild b/dev-java/java-gnome/java-gnome-4.1.3.ebuild
index d947dce0101f..62ceec68ea0d 100644
--- a/dev-java/java-gnome/java-gnome-4.1.3.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.1.3.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$
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="4.1"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	app-text/enchant:0
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.ebuild
index e7056fb51178..7f073e8433c5 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.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$
 
@@ -13,7 +13,7 @@ DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
 HOMEPAGE="http://download.oracle.com/javase/6/docs/index.html"
 LICENSE="oracle-java-documentation"
 SLOT="1.6.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
index 54a429bd0942..d9fd8bf2ccda 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.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,7 +17,7 @@ SRC_URI="${ORIG_NAME}"
 
 LICENSE="oracle-java-documentation-7"
 SLOT="1.7"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.66.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.66.ebuild
index 2edd9c0f2687..cfbb1f08345d 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.66.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.66.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 @@ HOMEPAGE="http://download.oracle.com/javase/8/docs/"
 SRC_URI="${ORIG_NAME}"
 LICENSE="oracle-java-documentation-8"
 SLOT="1.8"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
 RESTRICT="fetch"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-java/javacc/javacc-5.0-r2.ebuild b/dev-java/javacc/javacc-5.0-r2.ebuild
index 299b4fd7c3a1..75b9550d836e 100644
--- a/dev-java/javacc/javacc-5.0-r2.ebuild
+++ b/dev-java/javacc/javacc-5.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/javacup/javacup-0.11a_beta20060608.ebuild b/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
index 0c8a13fa7066..c1e9d6ad9f63 100644
--- a/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
+++ b/dev-java/javacup/javacup-0.11a_beta20060608.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 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~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="userland_BSD"
 
 # find for bug #214664
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
index edb77407e962..4d82769faa60 100644
--- a/dev-java/javacup/javacup-0.11b_p20151001.ebuild
+++ b/dev-java/javacup/javacup-0.11b_p20151001.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 @@ HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
 SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.7
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
index 4bf1748c0ed4..f509120a121d 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p63.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$
 
@@ -18,7 +18,7 @@ SRC_URI="https://${PN}.dev.java.net/files/documents/5985/145533/${MY_PN}-src-${M
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 COMMON_DEP="
 	java-virtuals/servlet-api:2.4"
diff --git a/dev-java/javassist/javassist-2.6-r2.ebuild b/dev-java/javassist/javassist-2.6-r2.ebuild
index 1cc7fdf00efd..466881a22bc1 100644
--- a/dev-java/javassist/javassist-2.6-r2.ebuild
+++ b/dev-java/javassist/javassist-2.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
 
 LICENSE="MPL-1.1"
 SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
index d774dc98d41e..2bb72fefe2a7 100644
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ b/dev-java/javassist/javassist-3.18.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_
 
 LICENSE="MPL-1.1"
 SLOT="3"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index 66adc4389def..3a48053fd8bc 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.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 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 python_prepare_all() {
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
index e24b4003c71c..3aeaaa08b3fd 100644
--- a/dev-java/javax-inject/javax-inject-1-r2.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
index b4509bc25118..3452280a566f 100644
--- a/dev-java/javolution/javolution-4.0.2-r1.ebuild
+++ b/dev-java/javolution/javolution-4.0.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://javolution.org"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/jax-ws-api/jax-ws-api-2.0.ebuild b/dev-java/jax-ws-api/jax-ws-api-2.0.ebuild
index e362028283a2..8982c3d41736 100644
--- a/dev-java/jax-ws-api/jax-ws-api-2.0.ebuild
+++ b/dev-java/jax-ws-api/jax-ws-api-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 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="https://jax-ws.dev.java.net/files/documents/4202/34734/jaxws-api-fcs-sr
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild b/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild
index a27705d56b7b..c5e469f116c0 100644
--- a/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild
+++ b/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/istack-commons-runtime:0
diff --git a/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild b/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild
index 9a1bdd1df9f9..a5f3abd900cf 100644
--- a/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild
+++ b/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="dev-java/istack-commons-runtime:0
diff --git a/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild b/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild
index 3f7b1388614b..505043617089 100644
--- a/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild
+++ b/dev-java/jaxb-tools/jaxb-tools-2.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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://jaxb.dev.java.net/${PV}/JAXB2_src_20070125.jar"
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="dev-java/codemodel:2
diff --git a/dev-java/jaxb/jaxb-2.1.2-r1.ebuild b/dev-java/jaxb/jaxb-2.1.2-r1.ebuild
index 6320cadaa8c6..a167e358ce3f 100644
--- a/dev-java/jaxb/jaxb-2.1.2-r1.ebuild
+++ b/dev-java/jaxb/jaxb-2.1.2-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$
 
@@ -15,7 +15,7 @@ SRC_URI="https://jaxb.dev.java.net/${PV}/${MY_P}.jar"
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/jaxen/jaxen-1.1.1.ebuild b/dev-java/jaxen/jaxen-1.1.1.ebuild
index 8b3a95acabd6..67938ac2464d 100644
--- a/dev-java/jaxen/jaxen-1.1.1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc source test"
 
 COMMON_DEP="~dev-java/jdom-1.0
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
index 4c078bf24cab..1f16dcc2a9e3 100644
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
index 70cfd567083c..3e6a341786d8 100644
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
index c7a12df9db19..4bf8f149c5da 100644
--- a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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=""
 
 COMMON_DEP=">=dev-java/antlr-2.7.7-r7:0
diff --git a/dev-java/jaxp/jaxp-1.4-r1.ebuild b/dev-java/jaxp/jaxp-1.4-r1.ebuild
index 15eff2c9d19b..c4c5816fbe55 100644
--- a/dev-java/jaxp/jaxp-1.4-r1.ebuild
+++ b/dev-java/jaxp/jaxp-1.4-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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/jaxr/jaxr-1.0.6-r2.ebuild b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild
index aadbcad020b5..0b6d671dc33b 100644
--- a/dev-java/jaxr/jaxr-1.0.6-r2.ebuild
+++ b/dev-java/jaxr/jaxr-1.0.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$
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jazzy/jazzy-0.5.2.ebuild b/dev-java/jazzy/jazzy-0.5.2.ebuild
index 358f6f2a7738..10ab3ef38598 100644
--- a/dev-java/jazzy/jazzy-0.5.2.ebuild
+++ b/dev-java/jazzy/jazzy-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 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/${PN}/${P}.src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/jcalendar/jcalendar-1.3.3.ebuild b/dev-java/jcalendar/jcalendar-1.3.3.ebuild
index 04f87060681c..7f1bd6777556 100644
--- a/dev-java/jcalendar/jcalendar-1.3.3.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.3.3.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,7 +14,7 @@ HOMEPAGE="http://www.toedter.com/en/jcalendar/"
 
 LICENSE="LGPL-2.1"
 SLOT="1.2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 COMMON_DEPEND="dev-java/jgoodies-looks:2.0"
 
diff --git a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
index cc018a8e0707..7fadb0395f2f 100644
--- a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.17-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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://jcifs.samba.org/src/${P}.tgz"
 HOMEPAGE="http://jcifs.samba.org/"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 RDEPEND=">=virtual/jre-1.4
 	java-virtuals/servlet-api:2.4"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jclasslib/jclasslib-3.0-r1.ebuild b/dev-java/jclasslib/jclasslib-3.0-r1.ebuild
index e99feea0682b..9cd7cd710d97 100644
--- a/dev-java/jclasslib/jclasslib-3.0-r1.ebuild
+++ b/dev-java/jclasslib/jclasslib-3.0-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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_unix_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
index 6eeb6a8b25d8..dc5527a62b5a 100644
--- a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
+++ b/dev-java/jcmdline/jcmdline-1.0.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://jcmdline.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
 LICENSE="MPL-1.1"
 SLOT="1.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jcmdline/jcmdline-2.0.0.ebuild b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
index d019da535ac9..bf9f6bf3d46f 100644
--- a/dev-java/jcmdline/jcmdline-2.0.0.ebuild
+++ b/dev-java/jcmdline/jcmdline-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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://jcmdline.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild
index d73a6457bbed..a196ed8e95d9 100644
--- a/dev-java/jcodings/jcodings-1.0.11.ebuild
+++ b/dev-java/jcodings/jcodings-1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/jcodings/jcodings-1.0.4.ebuild b/dev-java/jcodings/jcodings-1.0.4.ebuild
index 4c93e4fc9c35..4d91c54f0a96 100644
--- a/dev-java/jcodings/jcodings-1.0.4.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://jruby.codehaus.org/"
 SRC_URI="mirror://gentoo/${P}-git.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/jcodings/jcodings-1.0.5.ebuild b/dev-java/jcodings/jcodings-1.0.5.ebuild
index 422e4bd15a27..2ed2f2461ef7 100644
--- a/dev-java/jcodings/jcodings-1.0.5.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.5.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}-git.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
index 592fe937423d..4dbe6a304147 100644
--- a/dev-java/jcommon/jcommon-1.0.23.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.23.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 @@ SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-java/jcs/jcs-2.0.ebuild b/dev-java/jcs/jcs-2.0.ebuild
index e31677d17053..7f215a2525b0 100644
--- a/dev-java/jcs/jcs-2.0.ebuild
+++ b/dev-java/jcs/jcs-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 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/${PN}/source/
 
 LICENSE="Apache-2.0"
 SLOT="2.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="admin"
 
 CDEPEND="dev-java/jisp:2.5
diff --git a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
index 0795867b0f2b..5202bbde73de 100644
--- a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
+++ b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ DESCRIPTION="JDBC Type 4 Drivers for Informix"
 SRC_URI="${At}"
 HOMEPAGE="http://www.ibm.com/software/data/informix/tools/jdbc/"
 DOWNLOADPAGE="http://www14.software.ibm.com/webapp/download/search.jsp?go=y&rs=ifxjdbc"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 LICENSE="informix-jdbc"
 SLOT="0"
 DEPEND=">=virtual/jre-1.4"
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
index e17706848838..49e90180d821 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
 SRC_URI="mirror://sourceforge/firebird/${At}.zip"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
index 6bd20c6a54b2..c3764612d71e 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
 SRC_URI="https://github.com/FirebirdSQL/${MY_PN}/archive/v${PV}.zip -> Jaybird-${PV}-src.zip"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~x86"
 IUSE="jni"
 
 CDEPEND="dev-java/junit:4
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
index 30b2dd9f6090..a8a15964ee81 100644
--- a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.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$
 
@@ -14,7 +14,7 @@ DESCRIPTION="JDBC driver for Microsoft SQL Server"
 HOMEPAGE="http://msdn.microsoft.com/en-US/data/aa937724.aspx"
 SRC_URI="http://download.microsoft.com/download/${MY_ID:0:1}/${MY_ID:1:1}/${MY_ID:2:1}/${MY_ID}/${MY_PN}_${PV}_enu.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="MSjdbcEULA40"
 SLOT="4.0"
 
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
index 9a29bc16f575..303afdc7fea1 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.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$
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="c3p0 log4j"
 
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
index c6b0c37fe729..020c1676aff4 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,7 +40,7 @@ SRC_URI="
 	doc? ( ${file_doc} )
 	examples? ( ${file_demo} )
 	nls? ( ${file_nls} )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="oracle-jdbc"
 SLOT="10.1"
 DEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
index 0c64d700f549..2b74326c5d7f 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,7 +40,7 @@ SRC_URI="
 	examples? ( ${file_demo} )
 	nls? ( ${file_nls} )
 	ons? ( ${file_ons} )"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 LICENSE="oracle-jdbc"
 SLOT="10.2"
 DEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
index ef3a07fbe42b..aadfaab2efd9 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,7 +40,7 @@ SRC_URI="
 	examples? ( ${file_demo} )
 	nls? ( ${file_nls} )
 	ons? ( ${file_ons} )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="oracle-jdbc"
 SLOT="10.2"
 DEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
index 4c5b2d48af65..11943639e800 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ SRC_URI="
 	debug? ( ${file_main_debug} )
 	${file_rowset}
 	doc? ( ${file_doc} )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="oracle-jdbc"
 SLOT="9.2"
 DEPEND=""
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
index fdc31c5e31a4..906827979212 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.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$
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
index 2ce76d975b4d..26051851762c 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.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$
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
index 03294cf8ff8c..26051851762c 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.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 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
index c6f95eecd59f..6e16330940ba 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.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 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
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 c6f95eecd59f..6e16330940ba 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.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 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-java/jdbm/jdbm-0.12-r2.ebuild b/dev-java/jdbm/jdbm-0.12-r2.ebuild
index c93a9f49cfcb..4a86a7ec4f34 100644
--- a/dev-java/jdbm/jdbm-0.12-r2.ebuild
+++ b/dev-java/jdbm/jdbm-0.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 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/${PN}/${P}-src.zip"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Needs to depend on 1.3 because this uses assert
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r5.ebuild
index 4e91a5c05618..709f885d9225 100644
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r5.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="http://www.clarkware.com/software/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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.4
diff --git a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
index 465a0d153548..9e12871b02f3 100644
--- a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.jdom.org/dist/source/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="JDOM"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
index b076ce432651..f97c1f035006 100644
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ b/dev-java/jdom/jdom-1.0-r2.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$
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.jdom.org/dist/source/${P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/jdom/jdom-1.0-r4.ebuild b/dev-java/jdom/jdom-1.0-r4.ebuild
index 24afcdf4a806..f6ea95eb8ebc 100644
--- a/dev-java/jdom/jdom-1.0-r4.ebuild
+++ b/dev-java/jdom/jdom-1.0-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$
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.jdom.org/dist/source/archive/${P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 328bd8d32f9f..9451d94da378 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 5a1abb469277..b01ce772a70a 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
index dea6e53d0f23..a32337dcf142 100644
--- a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
+++ b/dev-java/jdynamite/jdynamite-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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 CDEPEND="dev-java/gnu-regexp:1"
 
diff --git a/dev-java/jempbox/jempbox-0.2.0.ebuild b/dev-java/jempbox/jempbox-0.2.0.ebuild
index 8fce8938680d..6bd457993f39 100644
--- a/dev-java/jempbox/jempbox-0.2.0.ebuild
+++ b/dev-java/jempbox/jempbox-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jempbox.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/jempbox/jempbox-1.7.1.ebuild b/dev-java/jempbox/jempbox-1.7.1.ebuild
index 06251c03ceb3..379a80710079 100644
--- a/dev-java/jempbox/jempbox-1.7.1.ebuild
+++ b/dev-java/jempbox/jempbox-1.7.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="BSD"
 SLOT="1.7"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
index 15bbbb51b4c1..1a30cc862b18 100644
--- a/dev-java/jettison/jettison-1.3.7.ebuild
+++ b/dev-java/jettison/jettison-1.3.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/codehaus/jettison"
 SRC_URI="https://github.com/codehaus/${PN}/archive/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
index a8eaffc24a92..ee8d32dc4c86 100644
--- a/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8-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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
index a7c08f70fd3d..039916fd0e43 100644
--- a/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8.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,7 +14,7 @@ SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild b/dev-java/jffi/jffi-1.0.11-r1.ebuild
index 152668683243..c09f1665d54c 100644
--- a/dev-java/jffi/jffi-1.0.11-r1.ebuild
+++ b/dev-java/jffi/jffi-1.0.11-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,7 +13,7 @@ SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1.0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 393637b51c2c..3263879b9de1 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1.2"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="virtual/libffi:0"
 
diff --git a/dev-java/jflex/jflex-1.6.0-r2.ebuild b/dev-java/jflex/jflex-1.6.0-r2.ebuild
index fe06e23bd32d..7975464e7b44 100644
--- a/dev-java/jflex/jflex-1.6.0-r2.ebuild
+++ b/dev-java/jflex/jflex-1.6.0-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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.de/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="dev-java/ant-core:0
 	=dev-java/javacup-0.11a_beta20060608:0
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 27d01cbe01fa..6b50fe0fda77 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jflex.de/"
 SRC_URI="http://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
 
 CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/jformatstring/jformatstring-2.0.3.ebuild b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
index ab8ab1cbe929..91489b14e5c4 100644
--- a/dev-java/jformatstring/jformatstring-2.0.3.ebuild
+++ b/dev-java/jformatstring/jformatstring-2.0.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://code.google.com/p/j-format-string"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/jfreechart/jfreechart-1.0.19.ebuild b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
index 7317a59125e2..289d97e2e6cc 100644
--- a/dev-java/jfreechart/jfreechart-1.0.19.ebuild
+++ b/dev-java/jfreechart/jfreechart-1.0.19.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://sourceforge/${PN}/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+servlet test"
 
 CDEPEND=">=dev-java/jcommon-1.0.23:1.0
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
index f427dc78324e..9ee3ff57c0c5 100644
--- a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="2.1"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-java/jfreesvg/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
index 30dcdd289f1f..234ba21e3b77 100644
--- a/dev-java/jfreesvg/jfreesvg-3.0.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-3.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="3.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
index 67b072564242..2f02cea25e30 100644
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/animation-${MY_V}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
index d76e113857fb..a5fdec78a3ca 100644
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 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.jgoodies.com/download/libraries/animation-${MY_V}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
index 736d3e014154..14b04879fa6b 100644
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4.2
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
index 381d4513c7a1..3d4b20164f64 100644
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4.2
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
index 8192263eb065..9377a68e3dab 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-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$
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild
index db3897209d9a..b43552d93c73 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild
index d41641f7c421..03b477ab1493 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 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="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="1.2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.4.2
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
index 9747aba4322c..8e545b840972 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
index 35f874770460..705b727c9fd2 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-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$
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
index ee85bbf3c55b..eb340750855d 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="2.0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jgraph/jgraph-5.12.0.4.ebuild b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
index e18fae7f354f..abf8444c4d27 100644
--- a/dev-java/jgraph/jgraph-5.12.0.4.ebuild
+++ b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 JAVA_PKG_FILTER_COMPILER="jikes"
 
diff --git a/dev-java/jgrapht/jgrapht-0.8.3.ebuild b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
index e62efc8d3108..d475f6890f29 100644
--- a/dev-java/jgrapht/jgrapht-0.8.3.ebuild
+++ b/dev-java/jgrapht/jgrapht-0.8.3.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$
 
@@ -12,7 +12,7 @@ DESCRIPTION="Graph library that is a simpler and faster alternative to JGraph"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://jgrapht.sourceforge.net"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/dev-java/jgroups/jgroups-2.9.0.ebuild b/dev-java/jgroups/jgroups-2.9.0.ebuild
index 810dd77bea48..df474b758d3d 100644
--- a/dev-java/jgroups/jgroups-2.9.0.ebuild
+++ b/dev-java/jgroups/jgroups-2.9.0.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/javagroups/${MY_P}.src.zip"
 HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 RDEPEND=">=virtual/jre-1.5
 	dev-java/bsh:0
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
index 62045bb241da..516f122c65da 100644
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="dev-java/bcel:0
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
index 65b988daf6a0..9f1b0273d02c 100644
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="dev-java/bcel:0
diff --git a/dev-java/jibx/jibx-1.1.5-r1.ebuild b/dev-java/jibx/jibx-1.1.5-r1.ebuild
index 859cfc2ec047..c6eae7d757c5 100644
--- a/dev-java/jibx/jibx-1.1.5-r1.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x64-macos ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 COMMON_DEP="dev-java/dom4j:1
diff --git a/dev-java/jibx/jibx-1.1.5-r2.ebuild b/dev-java/jibx/jibx-1.1.5-r2.ebuild
index facdf06f24b5..8b65a164a717 100644
--- a/dev-java/jibx/jibx-1.1.5-r2.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-r2.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 CDEPEND="dev-java/dom4j:1
diff --git a/dev-java/jikes/jikes-1.22-r13.ebuild b/dev-java/jikes/jikes-1.22-r13.ebuild
index 1405cab6ca79..a50e125fe62c 100644
--- a/dev-java/jikes/jikes-1.22-r13.ebuild
+++ b/dev-java/jikes/jikes-1.22-r13.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$
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jikes.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=""
 RDEPEND=">=dev-java/java-config-2.0.0"
diff --git a/dev-java/jisp/jisp-2.5.1-r3.ebuild b/dev-java/jisp/jisp-2.5.1-r3.ebuild
index 48f0a2ce9b69..f3b317401a0a 100644
--- a/dev-java/jisp/jisp-2.5.1-r3.ebuild
+++ b/dev-java/jisp/jisp-2.5.1-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$
 
@@ -18,7 +18,7 @@ SRC_URI="http://gentooexperimental.org/distfiles/${P}-source.tar.gz"
 
 LICENSE="SVFL"
 SLOT="2.5"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/jlex/jlex-1.2.6-r1.ebuild b/dev-java/jlex/jlex-1.2.6-r1.ebuild
index 5957697e0389..f52e696dbaf5 100644
--- a/dev-java/jlex/jlex-1.2.6-r1.ebuild
+++ b/dev-java/jlex/jlex-1.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ inherit java-pkg-2
 DESCRIPTION="JLex: a lexical analyzer generator for Java"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 LICENSE="jlex"
 SLOT="0"
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/jlex/jlex-1.2.6-r2.ebuild b/dev-java/jlex/jlex-1.2.6-r2.ebuild
index 1c64fabca23e..27c578284236 100644
--- a/dev-java/jlex/jlex-1.2.6-r2.ebuild
+++ b/dev-java/jlex/jlex-1.2.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$
 
@@ -11,7 +11,7 @@ inherit java-pkg-2
 DESCRIPTION="JLex: a lexical analyzer generator for Java"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="jlex"
 SLOT="0"
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/jlfgr/jlfgr-1.0-r1.ebuild b/dev-java/jlfgr/jlfgr-1.0-r1.ebuild
index 97513bbc11df..ceeb3a09f772 100644
--- a/dev-java/jlfgr/jlfgr-1.0-r1.ebuild
+++ b/dev-java/jlfgr/jlfgr-1.0-r1.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$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/jlfgr-${MY_PV}.zip"
 
 LICENSE="sun-jlfgr"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-java/jlibeps/metadata.xml b/dev-java/jlibeps/metadata.xml
index ed6cb4271158..459701f25eb3 100644
--- a/dev-java/jlibeps/metadata.xml
+++ b/dev-java/jlibeps/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jlibeps</remote-id>
 	</upstream>
diff --git a/dev-java/jline/jline-1.0.ebuild b/dev-java/jline/jline-1.0.ebuild
index 41faa57e1609..f96d10afe5ad 100644
--- a/dev-java/jline/jline-1.0.ebuild
+++ b/dev-java/jline/jline-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://jline.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
index 8fd63276a234..662f440245a3 100644
--- a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
+++ b/dev-java/jmdns/jmdns-3.4.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://jmdns.sourceforge.net"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jmf-bin/jmf-bin-2.1.1e-r2.ebuild b/dev-java/jmf-bin/jmf-bin-2.1.1e-r2.ebuild
index ac381780fd4e..1674bcb16aac 100644
--- a/dev-java/jmf-bin/jmf-bin-2.1.1e-r2.ebuild
+++ b/dev-java/jmf-bin/jmf-bin-2.1.1e-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ S="${WORKDIR}/JMF-${PV}"
 DESCRIPTION="The Java Media Framework API (JMF)"
 SRC_URI="${At}"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/tech/index-jsp-140239.html"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="sun-bcla-jmf"
 SLOT="0"
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
index c399c5a7bda9..f19c21cba3ad 100644
--- a/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 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://gentoo/${JMI_ZIP}
 
 LICENSE="sun-bcla-jmi"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index 242b92132677..9375230237c2 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jmock.org/"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="dev-java/junit:0"
diff --git a/dev-java/jna/jna-3.4.0-r1.ebuild b/dev-java/jna/jna-3.4.0-r1.ebuild
index c6d40bd7bc97..97893878c452 100644
--- a/dev-java/jna/jna-3.4.0-r1.ebuild
+++ b/dev-java/jna/jna-3.4.0-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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="+awt +nio-buffers"
 REQUIRED_USE="test? ( awt nio-buffers )"
diff --git a/dev-java/jna/jna-3.4.0.ebuild b/dev-java/jna/jna-3.4.0.ebuild
index 8d90aa387892..a4584eadaac9 100644
--- a/dev-java/jna/jna-3.4.0.ebuild
+++ b/dev-java/jna/jna-3.4.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/twall/jna#readme"
 SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="+awt +nio-buffers"
 REQUIRED_USE="test? ( awt nio-buffers )"
 
diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index 8ad9de76e34f..fe114e6fd8ed 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/twall/jna#readme"
 SRC_URI="https://github.com/twall/jna/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+awt +nio-buffers"
 REQUIRED_USE="test? ( awt nio-buffers )"
 
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
index 5b09fb3ed50f..ecdab18befdc 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.zip -> ${P}.zip"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/joda-time/joda-time-1.6.ebuild b/dev-java/joda-time/joda-time-1.6.ebuild
index a2c08291e4ae..8d3aec4cc56c 100644
--- a/dev-java/joda-time/joda-time-1.6.ebuild
+++ b/dev-java/joda-time/joda-time-1.6.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://joda-time.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc 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"
 IUSE=""
 
 DEPEND="
diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0.ebuild
index b9bf76900716..45296ef96ad1 100644
--- a/dev-java/joni/joni-2.1.0.ebuild
+++ b/dev-java/joni/joni-2.1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2.1"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 CDEPEND="dev-java/asm:3
 	dev-java/jcodings:1"
diff --git a/dev-java/jopt-simple/jopt-simple-4.7.ebuild b/dev-java/jopt-simple/jopt-simple-4.7.ebuild
index 03135d142f9b..2918e7f9bed5 100644
--- a/dev-java/jopt-simple/jopt-simple-4.7.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pholser.github.com/jopt-simple/"
 SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="4.4"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/jortho/jortho-1.0.ebuild b/dev-java/jortho/jortho-1.0.ebuild
index aa51666f4570..d62318561323 100644
--- a/dev-java/jortho/jortho-1.0.ebuild
+++ b/dev-java/jortho/jortho-1.0.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,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/jortho/JOrtho%20Library/${PV}/JOrtho_${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jrexx/jrexx-1.1.1-r1.ebuild b/dev-java/jrexx/jrexx-1.1.1-r1.ebuild
index a0a881ab72f0..49d9e84db2d2 100644
--- a/dev-java/jrexx/jrexx-1.1.1-r1.ebuild
+++ b/dev-java/jrexx/jrexx-1.1.1-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$
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 HOMEPAGE="http://www.karneim.com/jrexx/"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
 		app-arch/unzip
diff --git a/dev-java/jsap/jsap-2.1-r1.ebuild b/dev-java/jsap/jsap-2.1-r1.ebuild
index ef61eb8e2ff9..db2a8a7959c9 100644
--- a/dev-java/jsap/jsap-2.1-r1.ebuild
+++ b/dev-java/jsap/jsap-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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-java/jsap/jsap-2.1-r2.ebuild b/dev-java/jsap/jsap-2.1-r2.ebuild
index 4f35b4e5c949..7a53d7b1086f 100644
--- a/dev-java/jsap/jsap-2.1-r2.ebuild
+++ b/dev-java/jsap/jsap-2.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jsap/jsap-2.1.ebuild b/dev-java/jsap/jsap-2.1.ebuild
index d558fc5d3b95..4e9f0e675eec 100644
--- a/dev-java/jsap/jsap-2.1.ebuild
+++ b/dev-java/jsap/jsap-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 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://sourceforge/${PN}/${MY_P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 COMMON_DEP="
diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
index 7e34c265ffe2..08929ded0e6b 100644
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jcraft.com/jsch/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 CDEPEND=""
diff --git a/dev-java/json-simple/json-simple-1.1.ebuild b/dev-java/json-simple/json-simple-1.1.ebuild
index a560d70f8171..2ebe6f13a363 100644
--- a/dev-java/json-simple/json-simple-1.1.ebuild
+++ b/dev-java/json-simple/json-simple-1.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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://json-simple.googlecode.com/files/${MY_P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jsr101/jsr101-1.4-r3.ebuild b/dev-java/jsr101/jsr101-1.4-r3.ebuild
index 0e6af9368d5d..1371232e0b5c 100644
--- a/dev-java/jsr101/jsr101-1.4-r3.ebuild
+++ b/dev-java/jsr101/jsr101-1.4-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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jsr173/jsr173-1.0-r1.ebuild b/dev-java/jsr173/jsr173-1.0-r1.ebuild
index 75fdc3b5237e..22c601cfded1 100644
--- a/dev-java/jsr173/jsr173-1.0-r1.ebuild
+++ b/dev-java/jsr173/jsr173-1.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.3
diff --git a/dev-java/jsr181/jsr181-1.0-r2.ebuild b/dev-java/jsr181/jsr181-1.0-r2.ebuild
index 4e26906849b8..e74061f5193c 100644
--- a/dev-java/jsr181/jsr181-1.0-r2.ebuild
+++ b/dev-java/jsr181/jsr181-1.0-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$
 
@@ -17,7 +17,7 @@ SRC_URI="http://central.maven.org/maven2/javax/jws/${MY_PN}/${MY_PV}/${MY_P}-sou
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr223/jsr223-1.0-r2.ebuild b/dev-java/jsr223/jsr223-1.0-r2.ebuild
index 46843a880a7f..e5574a5c33be 100644
--- a/dev-java/jsr223/jsr223-1.0-r2.ebuild
+++ b/dev-java/jsr223/jsr223-1.0-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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${PN}-openjdk-6-src-b19.tar.bz2"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr225/jsr225-1.0.ebuild b/dev-java/jsr225/jsr225-1.0.ebuild
index ab10fe97e8a1..bb0a79f374cc 100644
--- a/dev-java/jsr225/jsr225-1.0.ebuild
+++ b/dev-java/jsr225/jsr225-1.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 @@ SRC_URI="https://github.com/cfoster/${MY_P}.0/raw/master/javax/xml/xquery/${MY_P
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr250/jsr250-1.0-r1.ebuild b/dev-java/jsr250/jsr250-1.0-r1.ebuild
index 115c04182e79..20279d598eb5 100644
--- a/dev-java/jsr250/jsr250-1.0-r1.ebuild
+++ b/dev-java/jsr250/jsr250-1.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.java.net/maven/2/javax/annotation/${PN}-api/${PV}/${PN}
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr305/jsr305-3.0.1.ebuild b/dev-java/jsr305/jsr305-3.0.1.ebuild
index a554d39f1ab0..698f85e2d1d6 100644
--- a/dev-java/jsr305/jsr305-3.0.1.ebuild
+++ b/dev-java/jsr305/jsr305-3.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
index d3f0dd294c6e..a33d1a2282bf 100644
--- a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
+++ b/dev-java/jsr311-api/jsr311-api-1.1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://repo1.maven.org/maven2/javax/ws/rs/${PN}/${PV}/${P}-sources.jar"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr322/jsr322-1.5.ebuild b/dev-java/jsr322/jsr322-1.5.ebuild
index 5d32efa93bc4..620706f8e75f 100644
--- a/dev-java/jsr322/jsr322-1.5.ebuild
+++ b/dev-java/jsr322/jsr322-1.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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/resource/${MY_PN}/${PV}/${MY_P}-so
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr67/jsr67-1.3.ebuild b/dev-java/jsr67/jsr67-1.3.ebuild
index a17df16457aa..c8e52654d9d2 100644
--- a/dev-java/jsr67/jsr67-1.3.ebuild
+++ b/dev-java/jsr67/jsr67-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 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="https://saaj.dev.java.net/spec-${PV}/saaj-api.jar"
 
 LICENSE="sun-jsr67"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/jsr93/jsr93-1.0-r2.ebuild b/dev-java/jsr93/jsr93-1.0-r2.ebuild
index 403064445b3e..5f7dd811d57b 100644
--- a/dev-java/jsr93/jsr93-1.0-r2.ebuild
+++ b/dev-java/jsr93/jsr93-1.0-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$
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="https://jcp.org/ja/jsr/detail?id=93"
 SRC_URI="http://repo1.maven.org/maven2/org/apache/ws/scout/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="sun-jsr93"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jssc/jssc-2.8.0.ebuild b/dev-java/jssc/jssc-2.8.0.ebuild
index ceed37a5e18b..e914d27308be 100644
--- a/dev-java/jssc/jssc-2.8.0.ebuild
+++ b/dev-java/jssc/jssc-2.8.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/scream3r/java-simple-serial-connector"
 SRC_URI="http://repo1.maven.org/maven2/org/scream3r/${PN}/${PV}/${P}-sources.jar"
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/jta/jta-1.0.1-r1.ebuild b/dev-java/jta/jta-1.0.1-r1.ebuild
index 8a3ef8142cd1..e53fd8bb9b90 100644
--- a/dev-java/jta/jta-1.0.1-r1.ebuild
+++ b/dev-java/jta/jta-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/tech/jta-138684.html"
 SRC_URI="${At}"
 LICENSE="sun-bcla-jta"
 SLOT=0
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 DEPEND=">=app-arch/unzip-5.50-r1
 	>=virtual/jdk-1.3"
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
index 719fa261d9c6..f2aec4a7fc3b 100644
--- a/dev-java/jta/jta-1.1.ebuild
+++ b/dev-java/jta/jta-1.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$
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/jta/index.html"
 SRC_URI="${JTA_ZIP}"
 LICENSE="sun-bcla-jta"
 SLOT=0
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 DEPEND=">=app-arch/unzip-5.50-r1
 >=virtual/jdk-1.5"
diff --git a/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild b/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild
index 7f9db1a4cd49..44d604191590 100644
--- a/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild
+++ b/dev-java/jtidy/jtidy-0_pre20010801-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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://jtidy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-dev.zip"
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
diff --git a/dev-java/jtidy/jtidy-1.0.ebuild b/dev-java/jtidy/jtidy-1.0.ebuild
index 089d46d9c9b1..da2484f0a080 100644
--- a/dev-java/jtidy/jtidy-1.0.ebuild
+++ b/dev-java/jtidy/jtidy-1.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 @@ HOMEPAGE="http://jtidy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/juel/juel-2.1.0-r1.ebuild b/dev-java/juel/juel-2.1.0-r1.ebuild
index 5b28af54f654..d5c4bec5f37f 100644
--- a/dev-java/juel/juel-2.1.0-r1.ebuild
+++ b/dev-java/juel/juel-2.1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/juel/juel-2.1.0.ebuild b/dev-java/juel/juel-2.1.0.ebuild
index 3af16dc36451..36ddb8460b18 100644
--- a/dev-java/juel/juel-2.1.0.ebuild
+++ b/dev-java/juel/juel-2.1.0.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/dev-java/jump/jump-0.5.ebuild b/dev-java/jump/jump-0.5.ebuild
index a9283a86a71d..b189eb063628 100644
--- a/dev-java/jump/jump-0.5.ebuild
+++ b/dev-java/jump/jump-0.5.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$
 
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-ant-2
 DESCRIPTION="JUMP Ultimate Math Package (JUMP) is a Java-based extensible high-precision math package"
 SRC_URI="mirror://sourceforge/${PN}-math/${P}.tar.gz"
 HOMEPAGE="http://jump-math.sourceforge.net/"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD"
 SLOT="0"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
index ae0b0e213b14..f946ec2dc901 100644
--- a/dev-java/jung/jung-1.7.6-r1.ebuild
+++ b/dev-java/jung/jung-1.7.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild
index 72f66e7316d6..f3cc4a3ed266 100644
--- a/dev-java/junit/junit-3.8.2-r1.ebuild
+++ b/dev-java/junit/junit-3.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip"
diff --git a/dev-java/junit/junit-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild
index 4a05bd3ad113..9c89b6ec5ec8 100644
--- a/dev-java/junit/junit-4.10.ebuild
+++ b/dev-java/junit/junit-4.10.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://github/KentBeck/${PN}/${PN}${PV}.zip"
 HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="dev-java/hamcrest-core:0"
diff --git a/dev-java/junit/junit-4.11.ebuild b/dev-java/junit/junit-4.11.ebuild
index deba38725578..9146e1717feb 100644
--- a/dev-java/junit/junit-4.11.ebuild
+++ b/dev-java/junit/junit-4.11.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$
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="4"
 
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/hamcrest-core:1.3"
 
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index 18e40b795148..0c2cb99065de 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-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,7 +13,7 @@ SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"
 HOMEPAGE="http://junit.org/"
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 CDEPEND="dev-java/hamcrest-core:1.3"
diff --git a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
index 62537d3e2342..8fdd5bee7d73 100644
--- a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.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$
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
 HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE=""
 
diff --git a/dev-java/jutils/jutils-1.0.0-r1.ebuild b/dev-java/jutils/jutils-1.0.0-r1.ebuild
index e13420cf4ef5..9116fcefb3ef 100644
--- a/dev-java/jutils/jutils-1.0.0-r1.ebuild
+++ b/dev-java/jutils/jutils-1.0.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://java.net/projects/jutils"
 SRC_URI="http://central.maven.org/maven2/net/java/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
index c1065f4b5b6f..35ab5326bb3b 100644
--- a/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
+++ b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://jvyaml.dev.java.net/"
 SRC_URI="https://${PN}.dev.java.net/files/documents/5215/41455/${PN}-src-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild b/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
index 9cce3c6eb967..c9f041685df1 100644
--- a/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
+++ b/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/olabini/jvyamlb"
 SRC_URI="https://jvyamlb.googlecode.com/files/jvyamlb-src-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 CDEPEND="dev-java/bytelist:0
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index a03255db84d1..98c97d084154 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,5 +1,4 @@
 DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
-DIST jython-2.1.tar.bz2 1301528 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 SHA512 397ad2819eb5bb39e1b0c0673922af7fbb75f680d707a7c344d21f680901a6fd96eddbbed8b464fb91cccd6f38a9f9b1a8f8327a530ac870002b72c38bf75ad3 WHIRLPOOL 00a1e7376b1883fc835dc801d718041a623ab0406393135d452df613fbbb9a87ab6bf4429b07260e93530f04031e531d4e041bacf22491d7ec0db76a41d77061
 DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41
 DIST jython-installer-2.5.3.jar 18487200 SHA256 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e SHA512 92d00cc8d885806749c67d1dc820e7b402c807b9a40277073fc3ea1f3dd10e1e506dc241a342874db8109120e8f0031a8dc7a4db6a88dfdc6c89906eeb9d454d WHIRLPOOL e8e3adf741a35b5e4de6c67b8805582cabc8590afac28c2e4ae3b61c4bd38d41904d7d1e4a23de21e7870d628e33a52f540fc89780a4724403b0bd92e1159768
 DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8
diff --git a/dev-java/jython/jython-2.1-r11.ebuild b/dev-java/jython/jython-2.1-r11.ebuild
deleted file mode 100644
index fa76eb16b7a2..000000000000
--- a/dev-java/jython/jython-2.1-r11.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit base java-pkg-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-MY_PV="21"
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="readline source doc"
-# servlet
-
-CDEPEND="=dev-java/jakarta-oro-2.0*
-	readline? ( >=dev-java/libreadline-java-0.8.0 )"
-#	servlet? ( >=www-servers/tomcat-5.0 )
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	source? ( app-arch/zip )
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PV}-assert.patch
-	epatch ${FILESDIR}/${PV}-assert-SimpleCompiler.py.patch
-
-	# bug #160861
-	rm -rf org/apache
-}
-
-src_compile() {
-	local cp="$(java-pkg_getjars jakarta-oro-2.0)"
-	local exclude=""
-
-	if use readline ; then
-		cp=${cp}:$(java-pkg_getjars libreadline-java)
-	else
-		exclude="${exclude} ! -name ReadlineConsole.java"
-	fi
-
-	#if use servlet; then
-	#	cp=${cp}:$(java-pkg_getjars servlet)
-	#else
-		exclude="${exclude} ! -name PyServlet.java"
-	#fi
-
-	ejavac -classpath ${cp} -nowarn $(find org -name "*.java" ${exclude})
-
-	find org -name "*.class" | xargs jar cf ${PN}.jar
-
-	# bug 115551
-	cd Lib/jxxload_help
-	ejavac -classpath ${S}/${PN}.jar -nowarn *.java
-	rm -f *.java Makefile
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	dodoc README.txt NEWS ACKNOWLEDGMENTS
-	use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/*
-
-	java-pkg_dolauncher jythonc \
-						--main "org.python.util.jython" \
-						--java_args "-Dpython.home=/usr/share/jython" \
-						--pkg_args "/usr/share/jython/tools/jythonc/jythonc.py"
-
-	java-pkg_dolauncher jython \
-						--main "org.python.util.jython" \
-						--java_args "-Dpython.home=/usr/share/jython"
-
-	dodir /usr/share/jython/cachedir
-	chmod a+rw ${D}/usr/share/jython/cachedir
-
-	rm Demo/jreload/example.jar
-	insinto /usr/share/${PN}
-	doins -r Lib Demo registry
-
-	insinto /usr/share/${PN}/tools
-	doins -r Tools/*
-
-	use source && java-pkg_dosrc com org
-}
-
-pkg_postinst() {
-	if use readline; then
-		elog "To use readline you need to add the following to your registry"
-		elog
-		elog "python.console=org.python.util.ReadlineConsole"
-		elog "python.console.readlinelib=GnuReadline"
-		elog
-		elog "The global registry can be found in /usr/share/${PN}/registry"
-		elog "User registry in \$HOME/.jython"
-		elog "See http://www.jython.org/docs/registry.html for more information"
-		elog ""
-	fi
-
-	elog "This revision renames org.python.core.Py.assert to assert_."
-	elog "This is the solution that upstream will use in the next release."
-	elog "Just note that this revision is not API compatible with vanilla 2.1."
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=142099"
-}
diff --git a/dev-java/jython/jython-2.2.1-r1.ebuild b/dev-java/jython/jython-2.2.1-r1.ebuild
deleted file mode 100644
index e534548228b3..000000000000
--- a/dev-java/jython/jython-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-
-JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle"
-#jdnc
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-
-MY_PV="installer-2.2.1"
-PYVER="2.2.3"
-
-SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
-mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-CDEPEND="=dev-java/jakarta-oro-2.0*
-	readline? ( >=dev-java/libreadline-java-0.8.0 )
-	mysql? ( >=dev-java/jdbc-mysql-3.1 )
-	postgres? ( dev-java/jdbc-postgresql )
-	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
-	servletapi? ( java-virtuals/servlet-api:2.5 )
-	!<=dev-java/freemarker-2.3.10"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		dev-java/javacc
-		${CDEPEND}"
-
-S="${WORKDIR}"
-
-#Tests currently very broken. Need to investigate whether that
-#is jython's or gentoo's doing.
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-build.patch"
-
-	rm -Rfv org || die "Unable to remove class files."
-	find . -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-
-	echo javacc.jar="$(java-pkg_getjars --build-only javacc)" > ant.properties
-
-	if use readline; then
-		echo "readline.jar=$(java-pkg_getjars libreadline-java)" >> \
-		ant.properties
-	fi
-	if use servletapi; then
-		echo "servlet.jar=$(java-pkg_getjar --virtual servlet-api-2.5 servlet-api.jar)" \
-		>> ant.properties
-	fi
-	if use mysql; then
-		echo "mysql.jar=$(java-pkg_getjar jdbc-mysql jdbc-mysql.jar)" \
-		>> ant.properties
-	fi
-
-	if use postgres; then
-		echo \
-		"postgresql.jar=$(java-pkg_getjar jdbc-postgresql jdbc-postgresql.jar)"\
-		 >> ant.properties
-	fi
-
-	if use oracle; then
-		echo \
-		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
-		>> ant.properties
-	fi
-}
-
-src_compile() {
-	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
-	local pylib="Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib} -Dsvn.checkout.dir=."
-	LC_ALL=C eant ${antflags} developer-build $(use_doc javadoc)
-}
-
-src_test() {
-	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
-	antflags="${antflags} -Dpython.home=dist"
-	local pylib="Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	eant ${antflags} bugtest
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-
-	dodoc README.txt NEWS ACKNOWLEDGMENTS
-	use doc && dohtml -A .css .jpg .gif -r Doc/*
-
-	local java_args="-Dpython.home=/usr/share/jython"
-	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
-
-	java-pkg_dolauncher jythonc \
-						--main "org.python.util.jython" \
-						--java_args "${java_args}" \
-						--pkg_args "${java_args} /usr/share/jython/tools/jythonc/jythonc.py"
-
-	java-pkg_dolauncher jython \
-						--main "org.python.util.jython" \
-						--pkg_args "${java_args}"
-
-	insinto /usr/share/${PN}
-	doins -r dist/Lib registry
-
-	insinto /usr/share/${PN}/tools
-	doins -r dist/Tools/*
-
-	use doc && java-pkg_dojavadoc dist/Doc/javadoc
-	use source && java-pkg_dosrc src
-	use examples && java-pkg_doexamples dist/Demo/*
-}
-
-pkg_postinst() {
-	if use readline; then
-		elog "To use readline you need to add the following to your registry"
-		elog
-		elog "python.console=org.python.util.ReadlineConsole"
-		elog "python.console.readlinelib=GnuReadline"
-		elog
-		elog "The global registry can be found in /usr/share/${PN}/registry"
-		elog "User registry in \$HOME/.jython"
-		elog "See http://www.jython.org/docs/registry.html for more information"
-		elog ""
-	fi
-}
diff --git a/dev-java/jython/jython-2.2.1-r2.ebuild b/dev-java/jython/jython-2.2.1-r2.ebuild
index 91343e0ade6e..338dd9acab3f 100644
--- a/dev-java/jython/jython-2.2.1-r2.ebuild
+++ b/dev-java/jython/jython-2.2.1-r2.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$
 
@@ -19,7 +19,7 @@ mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jzlib/jzlib-1.0.7-r1.ebuild b/dev-java/jzlib/jzlib-1.0.7-r1.ebuild
index ca4fd0a92e66..6d58b6fb8a45 100644
--- a/dev-java/jzlib/jzlib-1.0.7-r1.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.7-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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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.4"
diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild
index 5151533e9593..19688aff6097 100644
--- a/dev-java/jzlib/jzlib-1.1.1.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jcraft.com/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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="
diff --git a/dev-java/jzlib/jzlib-1.1.3.ebuild b/dev-java/jzlib/jzlib-1.1.3.ebuild
index 8448a8c5f5e0..8cef17e77bb3 100644
--- a/dev-java/jzlib/jzlib-1.1.3.ebuild
+++ b/dev-java/jzlib/jzlib-1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="1.1.3"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 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"
 
 RDEPEND="
 	>=virtual/jre-1.5"
diff --git a/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild b/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
index b8f2a56fae1e..92d248c12edc 100644
--- a/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
+++ b/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ SRC_URI="http://www.incors.org/archive/${P//./_}.zip"
 HOMEPAGE="http://www.incors.org/archive"
 LICENSE="LGPL-2.1"
 SLOT="2.0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.4
diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild
index ab0fc988cb66..3c280787125d 100644
--- a/dev-java/kxml/kxml-2.3.0.ebuild
+++ b/dev-java/kxml/kxml-2.3.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}2-src-${PV}.zip"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 CDEPEND="dev-java/xpp3:0"
 
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
index 197dd4e2647b..14b7f98ade51 100644
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-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$
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
index ba626b1d124d..b01c22829ede 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD"
 
 COMMON_DEP="sys-libs/ncurses"
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 6727a503b469..e2f7cc7dc7ef 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://logging.apache.org/log4j/"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE="javamail jms"
 
 CDEPEND="javamail? (
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
index bdea7daa5275..47478bbc3339 100644
--- a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
+++ b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://lucene.apache.org/java"
 SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.6"
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
index 9339292af664..d549f1fe1d16 100644
--- a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
+++ b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://lucene.apache.org/java"
 SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-linux ~amd64-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/lucene/lucene-1.4.3-r3.ebuild b/dev-java/lucene/lucene-1.4.3-r3.ebuild
index d55077424a4c..99f7e88d1141 100644
--- a/dev-java/lucene/lucene-1.4.3-r3.ebuild
+++ b/dev-java/lucene/lucene-1.4.3-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$
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="1"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	test? (
diff --git a/dev-java/lucene/lucene-1.9.1.ebuild b/dev-java/lucene/lucene-1.9.1.ebuild
index 47b9e8ee59aa..3a3a5681fb94 100644
--- a/dev-java/lucene/lucene-1.9.1.ebuild
+++ b/dev-java/lucene/lucene-1.9.1.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$
 
@@ -14,7 +14,7 @@ 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 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/lucene/lucene-2.1.0-r1.ebuild b/dev-java/lucene/lucene-2.1.0-r1.ebuild
index e9991cc4335d..d392bb8023a4 100644
--- a/dev-java/lucene/lucene-2.1.0-r1.ebuild
+++ b/dev-java/lucene/lucene-2.1.0-r1.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$
 
@@ -15,7 +15,7 @@ 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 ppc ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.1.0-r2.ebuild b/dev-java/lucene/lucene-2.1.0-r2.ebuild
index 3f9d63cfb472..379def5d19d2 100644
--- a/dev-java/lucene/lucene-2.1.0-r2.ebuild
+++ b/dev-java/lucene/lucene-2.1.0-r2.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$
 
@@ -15,7 +15,7 @@ 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 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.2.0-r1.ebuild b/dev-java/lucene/lucene-2.2.0-r1.ebuild
index fe5d6441b60d..bd7f6acb7c96 100644
--- a/dev-java/lucene/lucene-2.2.0-r1.ebuild
+++ b/dev-java/lucene/lucene-2.2.0-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$
 
@@ -15,7 +15,7 @@ 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 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.2.0.ebuild b/dev-java/lucene/lucene-2.2.0.ebuild
index b6c685e1b7d9..13a9f574f336 100644
--- a/dev-java/lucene/lucene-2.2.0.ebuild
+++ b/dev-java/lucene/lucene-2.2.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$
 
@@ -15,7 +15,7 @@ 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 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.3.0.ebuild b/dev-java/lucene/lucene-2.3.0.ebuild
index e7166069de34..f83874ddfb68 100644
--- a/dev-java/lucene/lucene-2.3.0.ebuild
+++ b/dev-java/lucene/lucene-2.3.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,7 @@ 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 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.3.1.ebuild b/dev-java/lucene/lucene-2.3.1.ebuild
index e7166069de34..f83874ddfb68 100644
--- a/dev-java/lucene/lucene-2.3.1.ebuild
+++ b/dev-java/lucene/lucene-2.3.1.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,7 @@ 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 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.3.2-r1.ebuild b/dev-java/lucene/lucene-2.3.2-r1.ebuild
index 1d907460792c..e8c512a560fe 100644
--- a/dev-java/lucene/lucene-2.3.2-r1.ebuild
+++ b/dev-java/lucene/lucene-2.3.2-r1.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$
 
@@ -18,7 +18,7 @@ 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 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.3.2-r2.ebuild b/dev-java/lucene/lucene-2.3.2-r2.ebuild
index a4f9e49de799..6afd27af644b 100644
--- a/dev-java/lucene/lucene-2.3.2-r2.ebuild
+++ b/dev-java/lucene/lucene-2.3.2-r2.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$
 
@@ -18,7 +18,7 @@ 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 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.3.2.ebuild b/dev-java/lucene/lucene-2.3.2.ebuild
index c38ef874e8b5..7196f0660acd 100644
--- a/dev-java/lucene/lucene-2.3.2.ebuild
+++ b/dev-java/lucene/lucene-2.3.2.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,7 @@ 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 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.4.0.ebuild b/dev-java/lucene/lucene-2.4.0.ebuild
index 9cc27f745122..44c1ffadd0f3 100644
--- a/dev-java/lucene/lucene-2.4.0.ebuild
+++ b/dev-java/lucene/lucene-2.4.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.4.1-r1.ebuild b/dev-java/lucene/lucene-2.4.1-r1.ebuild
index 0346bed97c40..ca869282edf6 100644
--- a/dev-java/lucene/lucene-2.4.1-r1.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-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$
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.4.1.ebuild b/dev-java/lucene/lucene-2.4.1.ebuild
index f84a0a4ec8f4..b4dfce5334f4 100644
--- a/dev-java/lucene/lucene-2.4.1.ebuild
+++ b/dev-java/lucene/lucene-2.4.1.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$
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps
diff --git a/dev-java/lucene/lucene-2.9.1-r1.ebuild b/dev-java/lucene/lucene-2.9.1-r1.ebuild
index ac09a09721cb..5a229491e610 100644
--- a/dev-java/lucene/lucene-2.9.1-r1.ebuild
+++ b/dev-java/lucene/lucene-2.9.1-r1.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,7 @@ HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.9"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-nodeps:0
diff --git a/dev-java/lucene/lucene-2.9.4.ebuild b/dev-java/lucene/lucene-2.9.4.ebuild
index 3ed46b12cf49..a826ab1fc3be 100644
--- a/dev-java/lucene/lucene-2.9.4.ebuild
+++ b/dev-java/lucene/lucene-2.9.4.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$
 
@@ -17,7 +17,7 @@ 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 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps:0
diff --git a/dev-java/lucene/lucene-3.0.0.ebuild b/dev-java/lucene/lucene-3.0.0.ebuild
index 4e8a288ca530..2c5edfe2e8f9 100644
--- a/dev-java/lucene/lucene-3.0.0.ebuild
+++ b/dev-java/lucene/lucene-3.0.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,7 @@ HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps:0
diff --git a/dev-java/lucene/lucene-3.0.3.ebuild b/dev-java/lucene/lucene-3.0.3.ebuild
index a0dc5988dbd7..cebb169f907c 100644
--- a/dev-java/lucene/lucene-3.0.3.ebuild
+++ b/dev-java/lucene/lucene-3.0.3.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$
 
@@ -17,7 +17,7 @@ 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 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps:0
diff --git a/dev-java/maven-bin/maven-bin-1.1-r1.ebuild b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
index 264266860868..540bf09c6099 100644
--- a/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}.tar.gz"
 HOMEPAGE="http://maven.apache.org/"
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jdk-1.5"
 IUSE=""
diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
index 0579f16a7c07..accade5574ea 100644
--- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
index bde479968588..12e3c93e731b 100644
--- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.11-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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="2.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-2.0.11.ebuild b/dev-java/maven-bin/maven-bin-2.0.11.ebuild
index 8cdfc4202464..f8adcfba4e5c 100644
--- a/dev-java/maven-bin/maven-bin-2.0.11.ebuild
+++ b/dev-java/maven-bin/maven-bin-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2
 HOMEPAGE="http://maven.apache.org/"
 LICENSE="Apache-2.0"
 SLOT="2.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jdk-1.4
 	app-eselect/eselect-maven"
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
index 4414b126b323..518e15416594 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-2.2.1.ebuild b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
index 936a91af7e4d..01c1d03000d9 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2
 HOMEPAGE="http://maven.apache.org/"
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jdk-1.5
 	app-eselect/eselect-maven"
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
index 88f6ee5b4d80..ccd267a2d11b 100644
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
index 8d5d687517f7..2b2f4a8ea482 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/swaldman/${MY_PN}/archive/${MY_P}.zip"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="doc source"
 
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
index 7f9981b5da45..915604427530 100644
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.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$
 
@@ -9,7 +9,7 @@ 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="x86 ~ppc amd64"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="
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
index d8fd51fbdb73..76b02905cb2a 100644
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
 
diff --git a/dev-java/microba/microba-0.4.4.ebuild b/dev-java/microba/microba-0.4.4.ebuild
index ca18fec627ee..0bf92b2c6b91 100644
--- a/dev-java/microba/microba-0.4.4.ebuild
+++ b/dev-java/microba/microba-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ DESCRIPTION="Swing components for date operations and palettes"
 HOMEPAGE="http://microba.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-full.zip"
 LICENSE="BSD"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 COMMON_DEPEND=">=dev-java/jgraph-5.9.2"
diff --git a/dev-java/mimepull/mimepull-1.8.ebuild b/dev-java/mimepull/mimepull-1.8.ebuild
index 67767faa069a..f723050717c1 100644
--- a/dev-java/mimepull/mimepull-1.8.ebuild
+++ b/dev-java/mimepull/mimepull-1.8.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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/mimepull/mimepull-1.9.6-r1.ebuild b/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
index 1b9c02e787c1..c1d240e3b0d8 100644
--- a/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
+++ b/dev-java/mimepull/mimepull-1.9.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/jvnet/${PN}/${PN}/${PV}/${P}-sources
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-java/mina-core/mina-core-1.1.7.ebuild b/dev-java/mina-core/mina-core-1.1.7.ebuild
index a15d2288cdad..d823515a9ff9 100644
--- a/dev-java/mina-core/mina-core-1.1.7.ebuild
+++ b/dev-java/mina-core/mina-core-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://mina.apache.org/"
 SRC_URI="mirror://gentoo/${P}-sources.jar"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5
diff --git a/dev-java/mockito/mockito-1.9.5-r1.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild
index e77fb032c6d8..82e00a3130bc 100644
--- a/dev-java/mockito/mockito-1.9.5-r1.ebuild
+++ b/dev-java/mockito/mockito-1.9.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
index 6ad6df962636..449c6553be36 100644
--- a/dev-java/msv/msv-20130601.ebuild
+++ b/dev-java/msv/msv-20130601.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 @@ HOMEPAGE="https://msv.java.net/"
 SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
 LICENSE="BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/iso-relax:0
 	dev-java/relaxng-datatype:0
diff --git a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
index 3842b243c787..0cecaeb6f9dc 100644
--- a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
+++ b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/${PN}/${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
index bc61ac38f0e6..b7f5e9cd9d4e 100644
--- a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
+++ b/dev-java/nailgun/nailgun-0.7.1-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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
index 2f5f1882abd1..720b108ba765 100644
--- a/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ MY_P=NanoXML-${PV}
 SRC_URI="http://nanoxml.cyberelf.be/downloads/${MY_P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 COMMON_DEP="dev-java/sax"
diff --git a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
index 706355871547..a5cf86a4985f 100644
--- a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
+++ b/dev-java/nekohtml/nekohtml-1.9.18-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP=">=dev-java/xerces-2.7"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/objenesis/objenesis-1.3.ebuild b/dev-java/objenesis/objenesis-1.3.ebuild
index bd32b3d5500f..4c217dc5d347 100644
--- a/dev-java/objenesis/objenesis-1.3.ebuild
+++ b/dev-java/objenesis/objenesis-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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-bin.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild b/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
index d092626182bc..4edc5c37890e 100644
--- a/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
+++ b/dev-java/offo-hyphenation/offo-hyphenation-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$
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://offo.sourceforge.net"
 SRC_URI="mirror://sourceforge/offo/${PN}_v${PV}.zip"
 LICENSE="GPL-2 Apache-2.0 LPPL-1.3b TeX"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-java/opencsv/opencsv-2.3.ebuild b/dev-java/opencsv/opencsv-2.3.ebuild
index 1e45723820f9..242503b3aaf4 100644
--- a/dev-java/opencsv/opencsv-2.3.ebuild
+++ b/dev-java/opencsv/opencsv-2.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src-with-libs.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
index 69e9180abd22..586bcc3d341c 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~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"
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
index 845cbb06b576..648d0b23f7ea 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~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"
diff --git a/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild b/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
index 66cec761d265..3faad4db356e 100644
--- a/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
+++ b/dev-java/pdf-renderer/pdf-renderer-0.9.1.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,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/PDFRenderer-full-${PV
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/pdfbox/pdfbox-1.8.8.ebuild b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
index c35448453b12..48e821edf7eb 100644
--- a/dev-java/pdfbox/pdfbox-1.8.8.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.8.8.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$
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 	http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
 LICENSE="BSD"
 SLOT="1.8"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/icu4j:4
diff --git a/dev-java/piccolo/piccolo-1.04.ebuild b/dev-java/piccolo/piccolo-1.04.ebuild
index 00ee109f7a23..8e88cf3bebeb 100644
--- a/dev-java/piccolo/piccolo-1.04.ebuild
+++ b/dev-java/piccolo/piccolo-1.04.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="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
index abb2c9c1c70d..101eac57f2db 100644
--- a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 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://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/portletapi/portletapi-1.0.ebuild b/dev-java/portletapi/portletapi-1.0.ebuild
index 56d6184b7fb5..ebae3d4a7afa 100644
--- a/dev-java/portletapi/portletapi-1.0.ebuild
+++ b/dev-java/portletapi/portletapi-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 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://apache/portals/jetspeed-2/sources/${JETSPEED_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/portletapi/portletapi-2.0.ebuild b/dev-java/portletapi/portletapi-2.0.ebuild
index 31306de50bc2..d1a81b2925b8 100644
--- a/dev-java/portletapi/portletapi-2.0.ebuild
+++ b/dev-java/portletapi/portletapi-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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.ibiblio.org/maven2/javax/portlet/${MY_PN}/${PV}/${MY_P}-
 
 LICENSE="Apache-2.0"
 SLOT="2.0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
index 12f6c9d91384..1666fc1f6caf 100644
--- a/dev-java/prefuse/prefuse-20071021_beta.ebuild
+++ b/dev-java/prefuse/prefuse-20071021_beta.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/prefuse/${MY_P}.zip"
 HOMEPAGE="http://prefuse.org"
 LICENSE="BSD"
 SLOT="2006"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 COMMON_DEP="dev-java/lucene:1"
 
diff --git a/dev-java/qdox/qdox-1.12-r1.ebuild b/dev-java/qdox/qdox-1.12-r1.ebuild
index 42326d9171bb..aa685c7c4e70 100644
--- a/dev-java/qdox/qdox-1.12-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12-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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.1
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PV}-SNAPSHOT"
 
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index d0b13a1cfd9f..542db4d57880 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
diff --git a/dev-java/qdox/qdox-1.6.3.ebuild b/dev-java/qdox/qdox-1.6.3.ebuild
index 6c85ec48792a..fddfeabf93f4 100644
--- a/dev-java/qdox/qdox-1.6.3.ebuild
+++ b/dev-java/qdox/qdox-1.6.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$
 
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/codehaus/qdox"
 SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="Apache-2.0"
 SLOT="1.6"
-KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 CDEPEND="dev-java/ant-core
diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
index 03db899f7a86..8b158c7e34ef 100644
--- a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ MY_P="${PN}-${MY_PV}"
 SRC_URI="ftp://snipsnap.org/radeox/${MY_P}-src.tgz"
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/commons-logging-1*"
diff --git a/dev-java/reflectasm/reflectasm-1.11.0.ebuild b/dev-java/reflectasm/reflectasm-1.11.0.ebuild
index 31838e030fd9..c69fd2cc4aa7 100644
--- a/dev-java/reflectasm/reflectasm-1.11.0.ebuild
+++ b/dev-java/reflectasm/reflectasm-1.11.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="https://github.com/EsotericSoftware/${PN}/archive/${P}.zip"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="dev-java/asm:4"
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
index 201e0108be13..3250c678fa1b 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
index 74bb5ca87b61..d3b5d9a2428f 100644
--- a/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
+++ b/dev-java/relaxngcc/relaxngcc-1.12-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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
index 3ee7191278a3..fa409b43dd96 100644
--- a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
+++ b/dev-java/relaxngcc/relaxngcc-1.12-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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
index fc16ee83e2ad..357afbe8b0f6 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 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.caucho.com/download/resin-${PV}-src.zip
 
 LICENSE="GPL-2"
 SLOT="2.4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
index bd9efb6e29ce..75a5c4186c08 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
 
 LICENSE="GPL-2"
 SLOT="2.5"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
index ef402f6e71ee..2f1948876cfc 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
index 3d99fe25c5bb..725eaf914fd2 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.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="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
index ad72b6b60c84..c9d7c08ddd57 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.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="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
index ad72b6b60c84..c9d7c08ddd57 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.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="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
index 753aa18d2a38..0a9aa6255d9b 100644
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ b/dev-java/rhino/rhino-1.7.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$
 
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.mozilla.org/rhino/"
 
 LICENSE="MPL-1.1 GPL-2"
 SLOT="1.6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE=""
 
 # ../rhino-Rhino1_7_7_RELEASE
diff --git a/dev-java/rngom/rngom-20051226.ebuild b/dev-java/rngom/rngom-20051226.ebuild
index 43892c9ef639..834f05be1896 100644
--- a/dev-java/rngom/rngom-20051226.ebuild
+++ b/dev-java/rngom/rngom-20051226.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$
 
@@ -12,7 +12,7 @@ SRC_URI="https://rngom.dev.java.net/files/documents/1647/26424/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="dev-java/relaxng-datatype
diff --git a/dev-java/rngom/rngom-20100718.ebuild b/dev-java/rngom/rngom-20100718-r1.ebuild
index e9848c605f87..386f19f7f55f 100644
--- a/dev-java/rngom/rngom-20100718.ebuild
+++ b/dev-java/rngom/rngom-20100718-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,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/kohsuke/${PN}/${PN}/${PV}/${P}-sourc
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="
@@ -47,3 +47,8 @@ JAVA_RM_FILES=(
 	org/kohsuke/rngom/parse/compact/CompactSyntaxConstants.java
 	org/kohsuke/rngom/parse/compact/CompactSyntaxTokenManager.java
 )
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" . -name "*.properties"
+}
diff --git a/dev-java/rundoc/rundoc-0.11.ebuild b/dev-java/rundoc/rundoc-0.11.ebuild
index 4c5cc4de1976..bb59dea8496d 100644
--- a/dev-java/rundoc/rundoc-0.11.ebuild
+++ b/dev-java/rundoc/rundoc-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP=">=dev-java/ant-core-1.5.4"
diff --git a/dev-java/saaj/saaj-1.3.19-r1.ebuild b/dev-java/saaj/saaj-1.3.19-r1.ebuild
index 05c7152ebcab..996486fb279c 100644
--- a/dev-java/saaj/saaj-1.3.19-r1.ebuild
+++ b/dev-java/saaj/saaj-1.3.19-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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 # jaf and saaj-api only for java 5
diff --git a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r1.ebuild b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r1.ebuild
index e98fb557c501..71d9d915b2d9 100644
--- a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r1.ebuild
+++ b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 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="mirror://sourceforge/sablecc/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/sablecc/sablecc-3.2.ebuild b/dev-java/sablecc/sablecc-3.2.ebuild
index 653f65d38d1c..58313f0f78d2 100644
--- a/dev-java/sablecc/sablecc-3.2.ebuild
+++ b/dev-java/sablecc/sablecc-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.sablecc.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/sablecc/sablecc-3.7.ebuild b/dev-java/sablecc/sablecc-3.7.ebuild
index 5b1b39afba07..1d824f5d9ca6 100644
--- a/dev-java/sablecc/sablecc-3.7.ebuild
+++ b/dev-java/sablecc/sablecc-3.7.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
diff --git a/dev-java/sac/sac-1.3-r1.ebuild b/dev-java/sac/sac-1.3-r1.ebuild
index 39aaeae281fa..469b1aa59038 100644
--- a/dev-java/sac/sac-1.3-r1.ebuild
+++ b/dev-java/sac/sac-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 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="http://www.w3.org/2002/06/sacjava-${PV}.zip"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/sax/sax-2.2.1-r2.ebuild b/dev-java/sax/sax-2.2.1-r2.ebuild
index 1e4cbe80cdb2..2a837cd16b45 100644
--- a/dev-java/sax/sax-2.2.1-r2.ebuild
+++ b/dev-java/sax/sax-2.2.1-r2.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sax/sax2r3.zip"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/saxon/saxon-6.5.5-r1.ebuild b/dev-java/saxon/saxon-6.5.5-r1.ebuild
index 7b2871efca79..658cc9af1a53 100644
--- a/dev-java/saxon/saxon-6.5.5-r1.ebuild
+++ b/dev-java/saxon/saxon-6.5.5-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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://saxon.sourceforge.net/"
 
 LICENSE="MPL-1.1"
 SLOT="6.5"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jdom:0"
diff --git a/dev-java/saxon/saxon-6.5.5.ebuild b/dev-java/saxon/saxon-6.5.5.ebuild
index f9c7640612ff..37f4a8844720 100644
--- a/dev-java/saxon/saxon-6.5.5.ebuild
+++ b/dev-java/saxon/saxon-6.5.5.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://saxon.sourceforge.net/"
 
 LICENSE="MPL-1.1"
 SLOT="6.5"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="~dev-java/jdom-1.0"
diff --git a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
index 0694e74acd6e..4eda7de72ee5 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/saxon/saxon-9.2.0.6.ebuild b/dev-java/saxon/saxon-9.2.0.6.ebuild
index f7bb106d8d08..b45fcde16683 100644
--- a/dev-java/saxon/saxon-9.2.0.6.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/saxpath/saxpath-1.0-r2.ebuild b/dev-java/saxpath/saxpath-1.0-r2.ebuild
index 8cd0d7da790a..0405e85148b6 100644
--- a/dev-java/saxpath/saxpath-1.0-r2.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz"
 
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.4"
 # doc needs ant-trax
diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
index 91dfde58caa3..46722640cafc 100644
--- a/dev-java/servletapi/servletapi-2.2-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r3.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$
 
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="2.2"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="doc"
 S="${WORKDIR}/jakarta-servletapi-src"
 
diff --git a/dev-java/servletapi/servletapi-2.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
index 203706597c3f..60700d63f873 100644
--- a/dev-java/servletapi/servletapi-2.3-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r3.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="mirror://gentoo/${P}-20021101.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.3"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
index 551d2722032f..9cb5cb867a94 100644
--- a/dev-java/servletapi/servletapi-2.4-r5.ebuild
+++ b/dev-java/servletapi/servletapi-2.4-r5.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 @@ SRC_URI="http://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apach
 
 LICENSE="Apache-1.1"
 SLOT="2.4"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/shared-objects/shared-objects-1.4-r3.ebuild b/dev-java/shared-objects/shared-objects-1.4-r3.ebuild
index 4c9db6c79d7a..4a950a3b53fb 100644
--- a/dev-java/shared-objects/shared-objects-1.4-r3.ebuild
+++ b/dev-java/shared-objects/shared-objects-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary"
 SRC_URI="http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
index e24ce3fad045..3be6f03954f7 100644
--- a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
+++ b/dev-java/simplyhtml/simplyhtml-0.13.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://simplyhtml.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_src_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/sjsxp/sjsxp-1.0.1-r1.ebuild b/dev-java/sjsxp/sjsxp-1.0.1-r1.ebuild
index 7bf787574fb7..f1f5ecf2bcea 100644
--- a/dev-java/sjsxp/sjsxp-1.0.1-r1.ebuild
+++ b/dev-java/sjsxp/sjsxp-1.0.1-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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/sjsxp/sjsxp-1.0.1-r2.ebuild b/dev-java/sjsxp/sjsxp-1.0.1-r2.ebuild
index e159f7837761..6c5843f40d50 100644
--- a/dev-java/sjsxp/sjsxp-1.0.1-r2.ebuild
+++ b/dev-java/sjsxp/sjsxp-1.0.1-r2.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,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/sjsxp/sjsxp-1.0.1.ebuild b/dev-java/sjsxp/sjsxp-1.0.1.ebuild
index 64b24b0eb841..9ae41d973e3f 100644
--- a/dev-java/sjsxp/sjsxp-1.0.1.ebuild
+++ b/dev-java/sjsxp/sjsxp-1.0.1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
index 3d1c2e18b423..41d0e910888d 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
index 43aeb4c368e5..6b2e15ea4942 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.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,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/slf4j-api:0
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
index af7e8c50c01a..8410cf8965a7 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-nop/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/slf4j-api:0"
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
index deb4203c4699..56cfc29c165d 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-java/smack/smack-2.2.1.ebuild b/dev-java/smack/smack-2.2.1.ebuild
index 9c0feff9d4f1..ab51c1568468 100644
--- a/dev-java/smack/smack-2.2.1.ebuild
+++ b/dev-java/smack/smack-2.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.jivesoftware.org/builds/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/xpp3"
diff --git a/dev-java/snip/snip-0.11.ebuild b/dev-java/snip/snip-0.11.ebuild
index 5083dfefebd8..77981c3c61e3 100644
--- a/dev-java/snip/snip-0.11.ebuild
+++ b/dev-java/snip/snip-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP=">=dev-java/ant-core-1.5.4"
diff --git a/dev-java/stax-ex/stax-ex-1.0-r4.ebuild b/dev-java/stax-ex/stax-ex-1.0-r4.ebuild
index 0c023f0b7cad..d02d66331b9b 100644
--- a/dev-java/stax-ex/stax-ex-1.0-r4.ebuild
+++ b/dev-java/stax-ex/stax-ex-1.0-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://stax-ex.java.net/files/documents/4480/44372/${P}-src.tar.gz"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/stax-ex/stax-ex-1.7.6.ebuild b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
index 6a9515c546f2..7193eb5cd32d 100644
--- a/dev-java/stax-ex/stax-ex-1.7.6.ebuild
+++ b/dev-java/stax-ex/stax-ex-1.7.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$
 
@@ -14,7 +14,7 @@ SRC_URI="https://maven.java.net/content/groups/public/org/jvnet/${PN/-/}/${PN}/$
 
 LICENSE="CDDL GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/stax/stax-1.2.0.ebuild b/dev-java/stax/stax-1.2.0.ebuild
index 4d9033619442..de68ba40c435 100644
--- a/dev-java/stax/stax-1.2.0.ebuild
+++ b/dev-java/stax/stax-1.2.0.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${PN}-src-${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild b/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
index 5a9e27eaf588..b20b192dc01d 100644
--- a/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
+++ b/dev-java/stax2-api/stax2-api-4.0.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$
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index f2df14fd5f45..26b188d23e86 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.stringtemplate.org/"
 SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index e36b97f11524..183a91c9f2e1 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.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 @@ SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
index 45ab45f87f2d..100273abb9bf 100644
--- a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
+++ b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 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://gentoo/dtd-parser-${PV}-src.zip"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
index e37c5b8465c0..3dc1cccdc87a 100644
--- a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.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$
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild b/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
index 7ee5e69096a9..09e4a5c02293 100644
--- a/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
+++ b/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="${CLASS_URI}
 	doc? ( ${DOC_URI} )"
 LICENSE="sun-bcla-j2ee-deployment"
 SLOT="1.1"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip"
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
index a217cc88da82..3f5cd23ca60c 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.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$
 
@@ -22,7 +22,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~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="doc source"
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
index b56e1db36686..d7b82771c5f7 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.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 @@ HOMEPAGE="https://jai.dev.java.net/"
 SRC_URI="http://download.java.net/media/jai/builds/release/${MY_PV}/jai-${MY_PV}-lib-linux-i586.tar.gz"
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.3"
 IUSE=""
diff --git a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
index 0af10b24f428..699084db4427 100644
--- a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
+++ b/dev-java/sun-javamail/sun-javamail-1.4.3.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://kenai.com/projects/javamail/downloads/download//javamail-${PV}-s
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~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=""
 
 COMMON_DEP="java-virtuals/jaf"
diff --git a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
index 7069ce1a824d..ec01acdf2fc4 100644
--- a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
+++ b/dev-java/sun-jimi/sun-jimi-1.0-r3.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,7 +14,7 @@ SRC_URI="jimi1_0.zip"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.3"
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index d58f46f4071a..bb1513f0dfbb 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://java.sun.com/products/jms/"
 SRC_URI="${At}"
 LICENSE="sun-bcla-jms"
 SLOT=0
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 RDEPEND=">=virtual/jre-1.3"
 DEPEND="app-arch/unzip
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index 7b35d4c6634e..faebe55d8614 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.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$
 
@@ -15,7 +15,7 @@ SRC_URI="${MY_P}-ri.zip"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/super-csv/super-csv-2.3.1.ebuild b/dev-java/super-csv/super-csv-2.3.1.ebuild
index d3327c9c591f..381ee9450d12 100644
--- a/dev-java/super-csv/super-csv-2.3.1.ebuild
+++ b/dev-java/super-csv/super-csv-2.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://super-csv.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/swing-layout/swing-layout-1.0.4.ebuild b/dev-java/swing-layout/swing-layout-1.0.4.ebuild
index 229d6e9a4fa5..b8928eef407b 100644
--- a/dev-java/swing-layout/swing-layout-1.0.4.ebuild
+++ b/dev-java/swing-layout/swing-layout-1.0.4.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$
 
@@ -12,7 +12,7 @@ SRC_URI="https://swing-layout.dev.java.net/files/documents/2752/144673/${P}-src.
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild
index 514c9cb42d26..62bc824f4368 100644
--- a/dev-java/swt/swt-3.5.2.ebuild
+++ b/dev-java/swt/swt-3.5.2.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$
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.5"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="cairo gnome opengl"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-java/swt/swt-3.6.1.ebuild b/dev-java/swt/swt-3.6.1.ebuild
index a33ea996fc0e..07cf74c07b37 100644
--- a/dev-java/swt/swt-3.6.1.ebuild
+++ b/dev-java/swt/swt-3.6.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$
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.6"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="cairo gnome opengl"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-java/swt/swt-3.7.1.ebuild b/dev-java/swt/swt-3.7.1.ebuild
index e22a743f051f..a64dac7d9842 100644
--- a/dev-java/swt/swt-3.7.1.ebuild
+++ b/dev-java/swt/swt-3.7.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$
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="cairo gnome opengl webkit"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-java/swt/swt-3.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild
index 2420d40ef318..5d09ebb0dc85 100644
--- a/dev-java/swt/swt-3.7.2-r1.ebuild
+++ b/dev-java/swt/swt-3.7.2-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$
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="cairo gnome opengl webkit"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-java/swt/swt-3.7.2.ebuild b/dev-java/swt/swt-3.7.2.ebuild
index 821781c78476..d4fadc7ed647 100644
--- a/dev-java/swt/swt-3.7.2.ebuild
+++ b/dev-java/swt/swt-3.7.2.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$
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 IUSE="cairo gnome opengl webkit"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild
index 275a3660006d..01520fc07500 100644
--- a/dev-java/swt/swt-3.8.2-r1.ebuild
+++ b/dev-java/swt/swt-3.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$
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.8"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="cairo gnome opengl webkit"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-java/swt/swt-3.8.2.ebuild b/dev-java/swt/swt-3.8.2.ebuild
index b1c1e3b93704..4ab27c959f13 100644
--- a/dev-java/swt/swt-3.8.2.ebuild
+++ b/dev-java/swt/swt-3.8.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$
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.8"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="cairo gnome opengl webkit"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-java/swt/swt-4.2-r1.ebuild b/dev-java/swt/swt-4.2-r1.ebuild
index aa7dcc5689c3..97ec11324f2c 100644
--- a/dev-java/swt/swt-4.2-r1.ebuild
+++ b/dev-java/swt/swt-4.2-r1.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$
 
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="cairo gnome opengl webkit"
 
 COMMON_DEP="
diff --git a/dev-java/swt/swt-4.2-r2.ebuild b/dev-java/swt/swt-4.2-r2.ebuild
index 55e353073408..0a62430b5f1e 100644
--- a/dev-java/swt/swt-4.2-r2.ebuild
+++ b/dev-java/swt/swt-4.2-r2.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$
 
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="cairo gnome opengl webkit"
 
 COMMON_DEP="
diff --git a/dev-java/swt/swt-4.2.ebuild b/dev-java/swt/swt-4.2.ebuild
index 6beffaddcc84..153cdcfa85a9 100644
--- a/dev-java/swt/swt-4.2.ebuild
+++ b/dev-java/swt/swt-4.2.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$
 
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="cairo gnome opengl webkit"
 
 COMMON_DEP="
diff --git a/dev-java/tablelayout/tablelayout-1.0.ebuild b/dev-java/tablelayout/tablelayout-1.0.ebuild
index b95618ece01a..964c4f51dad6 100644
--- a/dev-java/tablelayout/tablelayout-1.0.ebuild
+++ b/dev-java/tablelayout/tablelayout-1.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$
 
@@ -11,7 +11,7 @@ DESCRIPTION="Layout manager that makes creating user interfaces fast and easy"
 HOMEPAGE="https://tablelayout.dev.java.net/"
 SRC_URI="http://www.oracle.com/technetwork/java/${PN}.jar"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index c6fbb1b6bade..195e98c93146 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/telnetd/telnetd-2.0.ebuild b/dev-java/telnetd/telnetd-2.0.ebuild
index 02fc708ae4ae..c267f3a23dc2 100644
--- a/dev-java/telnetd/telnetd-2.0.ebuild
+++ b/dev-java/telnetd/telnetd-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 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/telnetd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/commons-logging"
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index 4cf5958ee682..7f442f0efc5e 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1 +1 @@
-DIST testng-6.8.zip 11550802 SHA256 72c7241109b149caea01af5f5c37c86b61b08f15864a8a40e15d069593625e0c SHA512 2e8ad30a2c2f68d0aad584ef92246381c8adf8a893af2ca9ff8fb7d304c26956dfc6564f120de80d22e3e7a53a1402e3869f19ef0e6a69c674cbe35a58811920 WHIRLPOOL b7cf05963aaba3009d7326fee12694c32798787ee4295044daabdcf6b5a50dbb4b17f2a201dcdcd6d191bbc6665c12db789be80e71625eb8d08ca29b3cdfcff2
+DIST testng-6.9.10.tar.gz 6271781 SHA256 2155f0461f6b80433781968b9465627f877ea579086cb4149ca68e5e711d8127 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e WHIRLPOOL 38ae9ac8732ee96f0c0c9f48e5e5ba1cef342ea2f866322d22064b8aca4d405318fcce8e4a1bd7ba6276645429fe3a9ec8be42a8e2065cbb0d99dc6b2a0059d7
diff --git a/dev-java/testng/files/testng-6.8-build-tests.xml b/dev-java/testng/files/testng-6.8-build-tests.xml
deleted file mode 100644
index e94606b60cea..000000000000
--- a/dev-java/testng/files/testng-6.8-build-tests.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<!-- From: https://github.com/cbeust/testng/blob/master/build-tests.xml -->
-
-<project name="testng" default="all" basedir=".">
-
-  <property file="build.properties"/>
-
-  <property name="report.dir" value="${test.output.dir}"/>
-  <property name="junit.report.dir" value="${report.dir}/test-tmp"/>
-  <property name="testng.report.dir" value="${report.dir}"/>
-
-  <target name="all" depends="prepare,compile,run,reports,done"/>
-
-  <!-- ==================================================================== -->
-  <!-- Compile                                                              -->
-  <!-- ==================================================================== -->
-  <path id="compile.cp">
-    <pathelement location="${testng.jar}" />
-    <fileset dir="${lib.dir}" includes="${guice2.jar}" />
-    <fileset dir="${lib.dir}" includes="${junit.jar}" />
-  </path>
-
-  <target name="env:info">
-    <echo>
-BASEDIR          =${basedir}
-TEST.DIR         =${test.dir}
-TEST.BUILD.DIR   =${test.build.dir}
-REPORT.DIR       =${report.dir}
-JUNIT.REPORT.DIR =${junit.report.dir}
-TESTNG.REPORT.DIR=${testng.report.dir}
-    </echo>
-  </target>
-
-  <target name="compile" depends="prepare">
-    <echo message="                                 -- Compiling tests --"/>
-
-    <property name="build.compiler" value="modern"/>
-    <javac debug="true"
-           source="1.5"
-           classpathref="compile.cp"
-           srcdir="${test.dir}"
-           destdir="${test.build.dir}"
-    />
-
-  </target>
-
-  <target name="prepare">
-    <tstamp/>
-    <mkdir dir="${test.build.dir}"/>
-    <mkdir dir="${junit.report.dir}"/>
-    <mkdir dir="${testng.report.dir}"/>
-
-  <taskdef name="testng"
-             classname="org.testng.TestNGAntTask"
-             classpath="${build.dir}"/>
-  </target>
-
-<!--
-  <property name="cobertura.dir" value="../cobertura-1.9.4.1" />
-
-  <path id="cobertura.classpath">
-      <fileset dir="${cobertura.dir}">
-          <include name="cobertura.jar" />
-          <include name="lib/**/*.jar" />
-      </fileset>
-  </path>
--->
-
-  <!-- ==================================================================== -->
-  <!-- Run                                                             -->
-  <!-- ==================================================================== -->
-
-  <path id="run.cp">
-<!--
-  	<path location="target/instrumented-classes" />
-  	<path refid="cobertura.classpath" />
--->
-    <path refid="compile.cp"/>
-    <pathelement location="${test.build.dir}"/>
-  </path>
-
-  <target name="run" description="Run tests" depends="compile,copy-resources">
-    <echo message="                                 -- Running tests --"/>
-    <echo message="                                 -- ${testng.jar} --" />
-    <testng classpathref="run.cp"
-            outputdir="${testng.report.dir}">
-      <xmlfileset dir="${test.resources.dir}" includes="testng.xml"/>
-      <jvmarg value="-Dtest.resources.dir=${test.resources.dir}" />
-      <jvmarg value="-Dsun.io.serialization.extendedDebugInfo=true" />
-    </testng>
-  </target>
-
-  <target name="copy-resources" description="Copies resources.">
-    <copy verbose="false"
-          file="${src.resources.dir}/testngtasks"
-          todir="${build.dir}" />
-    <copy todir="${build.dir}">
-      <fileset dir="${src.resources.dir}">
-        <exclude name="**/.*" />
-        <exclude name="**/CVS/*" />
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="run:single" description="Run 1 property file named with the ant property test" depends="compile">
-      <echo message="                                 -- testng-tests-run1 --"/>
-
-    <testng outputdir="${testng.report.dir}"
-        classpathref="run.cp"
-        useDefaultListeners="true"
-        outputDir="${testng.report.dir}">
-      <xmlfileset dir="${test.resources.dir}" includes="testng-single.xml"/>
-     </testng>
-
-      <echo>Report created in    open ${testng.report.dir}/index.html</echo>
-  </target>
-
-  <target name="run:antprop" description="Run a test to see if ant system propertes are passed correctly" depends="compile">
-      <echo message="                                 -- testng-tests-run-antprop --"/>
-      <property name="syspropset1" value="value 1"/>
-      <property name="syspropset2" value="value 2"/>
-      <propertyset id="propset1">
-          <propertyref name="syspropset1"/>
-          <propertyref name="syspropset2"/>
-      </propertyset>
-
-      <testng outputdir="${testng.report.dir}"
-              classpathref="run.cp">
-          <xmlfileset dir="${test.resources.dir}" includes="testng-single3.xml"/>
-          <propertyset refid="propset1"/>
-          <sysproperty key="sysprop1" value="value 3"/>
-      </testng>
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Run specific configuration                                           -->
-  <!-- ==================================================================== -->
-  <target name="run:conf"
-          if="testng.conf"
-          depends="clean:reports,compile"
-          description="Run specified tests">
-    <echo message="                                 -- testng-tests-run --"/>
-    <echo message="using: ${testng.conf}.xml"/>
-
-    <testng classpathref="run.cp"
-            outputDir="${testng.report.dir}">
-        <xmlfileset dir="${test.resources.dir}" includes="${testng.conf}.xml"/>
-    </testng>
-
-    <antcall target="clean.tmp"/>
-  </target>
-
-
-  <!-- ==================================================================== -->
-  <!-- Reports                                                              -->
-  <!-- ==================================================================== -->
-
-  <target name="reports">
-    <junitreport todir="${junit.report.dir}">
-      <fileset dir="${testng.report.dir}">
-        <include name="*.xml"/>
-        <exclude name="testng-failed.xml"/>
-        <exclude name="testng-results.xml" />
-      </fileset>
-      <report format="noframes" todir="${junit.report.dir}"/>
-    </junitreport>
-  </target>
-
-
-  <target name="clean.tmp">
-      <delete dir="${test.output.dir}"/>
-  </target>
-
-  <target name="clean:reports">
-      <delete dir="${report.dir}"/>
-      <delete dir="${junit.report.dir}"/>
-  </target>
-
-  <target name="clean" depends="clean.tmp,clean:reports">
-    <echo message="                                 -- test clean --"/>
-
-    <delete dir="${test.build.dir}"/>
-  </target>
-
-  <target name="done">
-    <echo>Reports can be found in:    open ${testng.report.dir}/index.html</echo>
-  </target>
-
-</project>
diff --git a/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch b/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch
deleted file mode 100644
index 2d7e91e74587..000000000000
--- a/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -12,7 +12,7 @@
-   <!-- ====================================================================== -->

-   <!-- PREPARE                                                                -->

-   <!-- ====================================================================== -->

--  <target name="prepare" depends="retrieve-dependencies"

-+  <target name="prepare"

-           description="Performs all preparations required to build.">

-     <tstamp />

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

-@@ -419,10 +419,6 @@
-   <!-- Ivy                                                                  -->

-   <!-- ==================================================================== -->

- 

--  <target name="retrieve-dependencies" description="Retrieve dependencies with ivy">

--    <ivy:retrieve log="quiet" />

--  </target>

--

-   <target name="publish">

-     <ivy:resolve />

-     <mkdir dir="dist/jars" />

diff --git a/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch b/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch
deleted file mode 100644
index ca793971c73a..000000000000
--- a/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -73,9 +73,6 @@
-       <param name="jar.file" value="${testng.jar}" />

-     </antcall>

-     <jar jarfile="${testng.jar}" update="true">

--      <zipfileset src="${lib.dir}/${beanshell.jar}" />

--      <zipfileset src="${lib.dir}/${jcommander.jar}" />

--      <zipfileset src="${lib.dir}/${yaml.jar}" />

-     </jar>

- 

-   </target>

-@@ -195,10 +192,6 @@
-       <param name="jar.file" value="${other.jars.dir}/${testng.junit.jar}" />

-     </antcall>

-     <jar jarfile="${other.jars.dir}/${testng.junit.jar}" update="true">

--      <zipfileset src="${lib.dir}/${beanshell.jar}" />

--      <zipfileset src="${lib.dir}/${jcommander.jar}" />

--      <zipfileset src="${lib.dir}/${junit.jar}" />

--      <zipfileset src="${lib.dir}/${yaml.jar}" />

-     </jar>

-   </target>

- 

-@@ -207,9 +200,6 @@
-       <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.guice.jar}" />

-     </antcall>

-     <jar jarfile="${other.jars.dir}/${testng.nobsh.guice.jar}" update="true">

--      <zipfileset src="${lib.dir}/${guice2.jar}" />

--      <zipfileset src="${lib.dir}/${jcommander.jar}" />

--      <zipfileset src="${lib.dir}/${junit.jar}" />

-     </jar>

-   </target>

- 

-@@ -218,9 +208,6 @@
-       <param name="jar.file" value="${other.jars.dir}/${testng.bsh.noguice.jar}" />

-     </antcall>

-     <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">

--      <zipfileset src="${lib.dir}/${beanshell.jar}" />

--      <zipfileset src="${lib.dir}/${jcommander.jar}" />

--      <zipfileset src="${lib.dir}/${junit.jar}" />

-     </jar>

-   </target>

- 

-@@ -229,8 +216,6 @@
-       <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.noguice.jar}" />

-     </antcall>

-     <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">

--      <zipfileset src="${lib.dir}/${jcommander.jar}" />

--      <zipfileset src="${lib.dir}/${junit.jar}" />

-     </jar>

-   </target>

- 

-@@ -239,7 +224,6 @@
-       <param name="jar.file" value="${other.jars.dir}/${testng.dist.jar}" />

-     </antcall>

-     <jar jarfile="${other.jars.dir}/${testng.dist.jar}" update="true">

--      <zipfileset src="${lib.dir}/${jcommander.jar}" />

-     </jar>

-   </target>

- 

diff --git a/dev-java/testng/testng-6.8-r4.ebuild b/dev-java/testng/testng-6.8-r4.ebuild
deleted file mode 100644
index ca20bf633e75..000000000000
--- a/dev-java/testng/testng-6.8-r4.ebuild
+++ /dev/null
@@ -1,100 +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 examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="New generation testing framework in Java"
-HOMEPAGE="http://testng.org/"
-SRC_URI="http://${PN}.org/${P}.zip"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-CDEPEND="
-	dev-java/bsh:0
-	dev-java/guice:2
-	dev-java/junit:4
-	dev-java/ant-core:0
-	dev-java/snakeyaml:0
-	dev-java/jcommander:0"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_ANT_CLASSPATH_TAGS+=" testng javadocs-current"
-JAVA_PKG_BSFIX_NAME="build.xml build-tests.xml"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_GENTOO_CLASSPATH="ant-core,bsh,guice-2,jcommander,junit-4,snakeyaml-1.9"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
-
-EANT_BUILD_TARGET="build"
-EANT_TEST_TARGET="tests"
-EANT_DOC_TARGET="javadocs"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-ivy-retrieve.patch
-	"${FILESDIR}"/${P}-remove-jar-bundling.patch
-)
-
-# Error: A JNI error has occurred, please check your installation and try again.
-RESTRICT="test"
-
-java_prepare() {
-	java-pkg_clean
-
-	cp "${FILESDIR}"/${P}-build-tests.xml build-tests.xml || die
-
-	epatch "${PATCHES[@]}"
-
-	# Removal of tests that break due to restrictions or environment expectations:
-	#     ServiceLoaderTest - Breaks due absolute URL load that Portage prevents;
-	#                         we assume the underlying functionality to work, as
-	#                         the underlying functionality is simple and should
-	#                         show the usage of this package to break.
-	sed -i '/test.serviceloader.ServiceLoaderTest/d' src/test/resources/testng.xml || die
-
-	#     TrueParallelTest - Doesn't always work, especially not on a system
-	#                        under load; since this could fail during parallel
-	#                        emerges, we assume the underlying functionality to
-	#                        work as it has definitely succeeded under lower load.
-	sed -i '/test.thread.TrueParallelTest/d' src/test/resources/testng.xml || die
-
-	mkdir lib || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-
-	local tests_file="target/test-output/index.html"
-
-	if [[ ! -f ${tests_file} ]] ; then
-		die "Tests failed, test output does not exist; a problem with starting the tests."
-	fi
-
-	grep 'method-stats.*failed' target/test-output/index.html > /dev/null && \
-		die "Tests failed; one or more test failed, see ${tests_file} for more details."
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	java-pkg_dolauncher ${PN} --main org.testng.TestNG
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc javadocs
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/main/java/{org,com}
-}
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
new file mode 100644
index 000000000000..b0a7c095161b
--- /dev/null
+++ b/dev-java/testng/testng-6.9.10.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"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
+HOMEPAGE="http://testng.org/"
+SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
+
+CDEPEND="dev-java/bsh:0
+	dev-java/guice:4
+	dev-java/junit:4
+	dev-java/ant-core:0
+	dev-java/snakeyaml:0
+	dev-java/jcommander:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? ( dev-java/assertj-core:2 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="ant-core,bsh,guice-4,jcommander,junit-4,snakeyaml"
+
+java_prepare() {
+	java-pkg_clean ! -path "./src/*"
+
+	cp -v src/generated/java/org/testng/internal/VersionTemplateJava \
+	   src/main/java/org/testng/internal/Version.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local RES=src/test/resources
+	local CP=${PN}.jar:$(java-pkg_getjars --with-dependencies "${JAVA_GENTOO_CLASSPATH},assertj-core-2")
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	java -cp "${RES}:${DIR}:${CP}" -Dtest.resources.dir=${RES} org.testng.TestNG -listener test.invokedmethodlistener.MyListener src/test/resources/testng.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main org.testng.TestNG
+	java-pkg_register-ant-task
+
+	dodoc {ANNOUNCEMENT,CHANGES,TODO}.txt
+
+	if use doc; then
+		docinto html
+		dodoc -r doc
+	fi
+}
diff --git a/dev-java/tijmp/tijmp-0.8.ebuild b/dev-java/tijmp/tijmp-0.8.ebuild
index 259fa531d8b2..f07d4e70d597 100644
--- a/dev-java/tijmp/tijmp-0.8.ebuild
+++ b/dev-java/tijmp/tijmp-0.8.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.khelekore.org/jmp/tijmp/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
index ec768ec71d59..472a86c1d6ab 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-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$
 
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="2.2"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_PN}"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
index 7c3202087cda..4ca0a901c33e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.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 @@ DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_P}/servletapi"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
index aa9e411251ba..06684821fe75 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-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$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
index 355a3c8a6d37..8cf06adfbda9 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.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 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
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 676adc077fb9..d54ca242c881 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
@@ -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 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ppc ~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
index f4acb7f0f90f..9a200f06c158 100644
--- 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
@@ -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 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ppc 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-7.0.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
index 66d434e821a9..a65792d36c15 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild
index eee41e50b94d..ce3c9b44216e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.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 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild
index 2c36a63894bc..72b092ba0650 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.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 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild
index d80f2ebdbff2..53b7d9bddd69 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.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 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.67.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.67.ebuild
index 2d9f280fbdaa..4d6ba5488c50 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.67.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.67.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 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
index 4074eeed92a1..8d0541f865b2 100644
--- a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
+++ b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://touchgraph.sourceforge.net"
 SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
index da4671041a4e..0c8abef220c3 100644
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/abego/treelayout"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/trove/trove-2.1.0.ebuild b/dev-java/trove/trove-2.1.0.ebuild
index a7cb022999fb..0ecb84db8c8b 100644
--- a/dev-java/trove/trove-2.1.0.ebuild
+++ b/dev-java/trove/trove-2.1.0.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://trove4j.sourceforge.net"
 LICENSE="LGPL-2.1"
 IUSE=""
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
 
diff --git a/dev-java/trove/trove-3.0.2-r1.ebuild b/dev-java/trove/trove-3.0.2-r1.ebuild
index 4c449e3c45fa..8ca14c664b60 100644
--- a/dev-java/trove/trove-3.0.2-r1.ebuild
+++ b/dev-java/trove/trove-3.0.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://trove4j.sourceforge.net"
 LICENSE="LGPL-2.1"
 IUSE=""
 SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
 S="${WORKDIR}/${PV}"
diff --git a/dev-java/trove/trove-3.0.2.ebuild b/dev-java/trove/trove-3.0.2.ebuild
index bf4d5c067ccc..91d05fb70892 100644
--- a/dev-java/trove/trove-3.0.2.ebuild
+++ b/dev-java/trove/trove-3.0.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$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://trove4j.sourceforge.net"
 LICENSE="LGPL-2.1"
 IUSE=""
 SLOT="3"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
 S="${WORKDIR}/${PV}"
diff --git a/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild b/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
index 8b3eb2a2cf9d..d7a16ce6910f 100644
--- a/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
+++ b/dev-java/txw2-runtime/txw2-runtime-20110809.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,7 +17,7 @@ SRC_URI="http://central.maven.org/maven2/com/sun/xml/${MY_PN}/${MY_PN}/${PV}/${M
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
index 26481d5cf2f9..dc19c3623a04 100644
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 
 CDEPEND=""
diff --git a/dev-java/velocity/velocity-1.7-r1.ebuild b/dev-java/velocity/velocity-1.7-r1.ebuild
index 56d72eadf8f0..a288f72936a9 100644
--- a/dev-java/velocity/velocity-1.7-r1.ebuild
+++ b/dev-java/velocity/velocity-1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-java/velocity/velocity-1.7.ebuild b/dev-java/velocity/velocity-1.7.ebuild
index f4ad82edfbe3..65a0d3d623f0 100644
--- a/dev-java/velocity/velocity-1.7.ebuild
+++ b/dev-java/velocity/velocity-1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
index df192a873c15..68a7cc1c4324 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
 
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 COMMON_DEP="
 	dev-java/jdom:0
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
index 54c51268b247..53722762bdef 100644
--- a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
+++ b/dev-java/ws-commons-util/ws-commons-util-1.0.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$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://ws.apache.org/commons/util/"
 SRC_URI="mirror://apache/ws/commons/util/sources/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild
index 302d75dcee90..a49340d72bfb 100644
--- a/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild
+++ b/dev-java/ws-commons-util/ws-commons-util-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$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://ws.apache.org/commons/util/"
 SRC_URI="mirror://apache/ws/commons/util/sources/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
index 5de603e1a8c2..62d490ce94b2 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
 
 DEPEND=">=virtual/jdk-1.4
 	test? ( =dev-java/junit-3.8* )
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
index 8204db7e1350..28b1403bf200 100644
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ b/dev-java/wstx/wstx-3.2.9-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/FasterXML/woodstox"
 SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
index 8eef30878cfe..85dfd7266169 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.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$
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://xalan.apache.org/"
 SRC_URI="mirror://apache/xalan/${MY_PN}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.3"
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2.ebuild
index 1d9c5b5a44de..619f5573b494 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.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$
 
@@ -24,7 +24,7 @@ SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
 	doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/javacup:0
 	dev-java/bcel:0"
diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild b/dev-java/xerces/xerces-2.11.0-r1.ebuild
index 935e6ddf4f33..375b9ff33d35 100644
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.11.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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 # they are missing from the upstream tarball"
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
index 2776621deb10..6306656b4abc 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.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 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~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=""
 
 # they are missing from the upstream tarball"
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
index ed2706a93ad8..07ac197e459f 100644
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ b/dev-java/xjavac/xjavac-20110814.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 @@ IUSE=""
 HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.7"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
index 33818c5b7649..f8300f8de5bc 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.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 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1.3"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~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="doc source"
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
index 10f80337fad4..117d3b675822 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.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 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1.4"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~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="doc source"
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
index b168fd243320..fc6a732f7c0c 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-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$
 
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.3"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~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=""
 
 JAVA_PKG_BSFIX_NAME="resolver.xml"
diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
index 28ea21b0d34a..6697d7c55890 100644
--- a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
+++ b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://apache/xml/commons/${MY_P}.tar.gz"
 # See ${S}/java/external for the license files
 LICENSE="Apache-1.1 public-domain W3C-document W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/xml-writer/xml-writer-0.2.ebuild b/dev-java/xml-writer/xml-writer-0.2.ebuild
index 982014d90492..802ab93db9f3 100644
--- a/dev-java/xml-writer/xml-writer-0.2.ebuild
+++ b/dev-java/xml-writer/xml-writer-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 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="http://www.megginson.com/downloads/${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
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 c8677efee61b..f1d772cc9793 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
@@ -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 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~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
index a71b7e581b88..f707a2d55127 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.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="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+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
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
index e947374bd57c..ffa8c2a5a823 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.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 @@ SRC_URI="http://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 CDEPEND="
 	dev-java/saxon:9
diff --git a/dev-java/xmldb/xmldb-20011111-r1.ebuild b/dev-java/xmldb/xmldb-20011111-r1.ebuild
index b0e125b9859e..27f25d96d5e3 100644
--- a/dev-java/xmldb/xmldb-20011111-r1.ebuild
+++ b/dev-java/xmldb/xmldb-20011111-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$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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=""
 
 # TODO please make compiling the junit tests optional
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
index faa0c90b9ded..4f196003b1f7 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/commons-io:1
 	>=dev-java/commons-logging-1:0"
diff --git a/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
index 541237defec1..1eca6f6cd225 100644
--- a/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
+++ b/dev-java/xmlrpc/xmlrpc-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$
 
@@ -15,7 +15,7 @@ SRC_URI="https://archive.apache.org/dist/ws/${PN}/sources/apache-${P}-src.tar.bz
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/commons-httpclient:3
 	dev-java/commons-codec:0
diff --git a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
index 3a226bccc58c..996c5a137043 100644
--- a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
+++ b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/xml/stream
 
 LICENSE="CDDL GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/stax-ex:1"
diff --git a/dev-java/xmlunit/xmlunit-1.6.ebuild b/dev-java/xmlunit/xmlunit-1.6.ebuild
index e7210f3e7694..f1fe207bc98f 100644
--- a/dev-java/xmlunit/xmlunit-1.6.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://xmlunit.sourceforge.net/"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
index f6d3a90bbc53..ca215ac09a7d 100644
--- a/dev-java/xom/xom-1.2.10.ebuild
+++ b/dev-java/xom/xom-1.2.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$
 
@@ -19,7 +19,7 @@ SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="dev-java/xerces:2
 		dev-java/xml-commons-external:1.3
diff --git a/dev-java/xp/xp-0.5-r2.ebuild b/dev-java/xp/xp-0.5-r2.ebuild
index 3ba1678245a2..b97e9ad6c925 100644
--- a/dev-java/xp/xp-0.5-r2.ebuild
+++ b/dev-java/xp/xp-0.5-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$
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.jclark.com/pub/xml/xp.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
index 1cb0522771ce..1c2581718e7b 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-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$
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P
 
 LICENSE="Apache-1.1 IBM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="test"
 
 # Some failures, partly because we haven't patched Xerces but probably
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
index 42506fd42ebb..b5aea4b41874 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions
 
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="test"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r2.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r2.ebuild
index 446c4176458e..10deda941034 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r2.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-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$
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions
 
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="test"
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild b/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild
index 42b8a66673f4..cce1e4c98055 100644
--- a/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild
+++ b/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/jibx/${PN}-${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 COMMON_DEP="dev-java/commons-logging:0
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
index 34b79e742449..cfddc8470e60 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415.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="http://java.net/downloads/msv/releases/${PN}.${PV}.zip"
 
 LICENSE="BSD Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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=""
 
 COMMON_DEP="
diff --git a/dev-java/xsom/xsom-20060901.ebuild b/dev-java/xsom/xsom-20060901.ebuild
index 382619dc95e4..f569ac149e52 100644
--- a/dev-java/xsom/xsom-20060901.ebuild
+++ b/dev-java/xsom/xsom-20060901.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/xsom-src-${PV}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 COMMON_DEP="
 	dev-java/relaxng-datatype
diff --git a/dev-java/xstream/xstream-1.3.1-r4.ebuild b/dev-java/xstream/xstream-1.3.1-r4.ebuild
index 306f95876bfe..6a30ad04cca4 100644
--- a/dev-java/xstream/xstream-1.3.1-r4.ebuild
+++ b/dev-java/xstream/xstream-1.3.1-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://repo.maven.apache.org/maven2/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc 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"
 
 # By default, these tests exit successfully on failure. Chewi has fixed
 # that below but it's probably because they blow up spectacularly on
diff --git a/dev-java/zemberek/zemberek-2.1.1.ebuild b/dev-java/zemberek/zemberek-2.1.1.ebuild
index db77b5c7a2ca..bc8b98dbdd15 100644
--- a/dev-java/zemberek/zemberek-2.1.1.ebuild
+++ b/dev-java/zemberek/zemberek-2.1.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$
 
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-nolibs-src.zip"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 LANGS="tr tk"
 
 S=${WORKDIR}/${P}-nolibs-src
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index f3c2deccdf57..c65e7ef09084 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 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.declarativa.com/interprolog/interprolog212.zip"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 0316e9539211..453f540e02ca 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,10 +1,7 @@
 DIST dSFMT-src-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899 SHA512 e59d54166dc2df9f6e6abd68658c3624082feabe445215256fead47a8944c41578d11c2b4ba57eac174587a45e445b2aabd867db24fd9e951842513cf914f60b WHIRLPOOL 986b24d8c302f21e305a6bbc6b33e42678c27018c71c566d3f052ce7600fd06c81d77375d08b2b40c0c4aa93ca74cad819a34d0350e33a61f5837f27de7cf193
-DIST double-conversion-1.1.1.tar.gz 7012946 SHA256 e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d SHA512 e116196eb60077565050995b060049747a3c72e743eea21c6c9fb68414adc533d456d19e1ca241f08895cca97a38511477bdc7d2e0cae38d149c83cb9d6896ad WHIRLPOOL d69604fbb6e1b5cac8d4dd0f8cf0af4621e32548e9e5061dcb843067a3f821c6f52e918e3e367988076b9ccf0be0ab68107cc6a21b02f4de424a1d98b399fc33
-DIST dsfmt-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899 SHA512 e59d54166dc2df9f6e6abd68658c3624082feabe445215256fead47a8944c41578d11c2b4ba57eac174587a45e445b2aabd867db24fd9e951842513cf914f60b WHIRLPOOL 986b24d8c302f21e305a6bbc6b33e42678c27018c71c566d3f052ce7600fd06c81d77375d08b2b40c0c4aa93ca74cad819a34d0350e33a61f5837f27de7cf193
-DIST julia-0.2.0.tar.bz2 4393404 SHA256 fecde7b4fbd26093dedd04564ce12b47a232525bf036c7b5f392f369ddc9a514 SHA512 3e0718c69936959dc717cf511f8fd7086eedb2fd4996519fcdb54a0b0c38d09b5b1c7d239e9e42234aab869446feec88bfd40b5419ae74c9f15bf523a757e898 WHIRLPOOL 265650e99028260d1dfe76c504468eca23bad0881790893d8b4b6cd98b0b5a936dc064ee1b661a04c762e2d78d4d23243158f594afef27001c8b4a0de259afff
-DIST julia-0.2.1.tar.gz 1899534 SHA256 be07283635b1bd73085f0152d3433762c1aaf115faa0e663a94d63f09c34f1b0 SHA512 67f89d88b2fca355482b2c979d50b865c9a772883bcec3b5cb82d0e096e168153972ada517d078fca1c13352b118ce9f031da162432308025f4437340d5d6635 WHIRLPOOL 22c12397e7bd217b628c3ba4e99f5e252011af1106c12abb4f796bcae544972e2d548f4858b30c7c5dfb6ef935fbc4181e3d5dbe3cc8a4bcac922f0b52d75fb3
 DIST julia-0.3.0.tar.gz 2271301 SHA256 1e9778129231aeff4e5f6100b0b71d2dbc4306cfc92cf533e527907d4a7a9aa1 SHA512 1f5affffc24a62ba791af5edfd1051435a20866fb5c46796e6ddb5037b0bea482a79b86bf77cf76565fd7833d87a9b8f3f03df7d5f537b72c5655bddaaf3e033 WHIRLPOOL b908a2c0bfbe649d102071b6a3207a60cafa38370c3ab7bb10eec3fe258f6d7da76f30bd71f8deba7ab3d40068816ddbf6c7ee42c6b154c0f873c5c67e975d4c
-DIST libuv-julia-0.2.1.tar.gz 652078 SHA256 60a98962ab7e10c924604ccd3373083e8c376a01fcac4bf568058b1f6b026f81 SHA512 73cc9903d1d9d8b8aa8c02543058f4c407aa6b125eb26506f55115cab212bcb7c1af0d215c2b9ca771f135d3913c1490a510294d658bf8d5a6dbee3dd397226f WHIRLPOOL 42b204b8cb071919b796ed745150b848fabe94668d7fb92a39505c86fefa98f52812ac2bec05821214c7e2c7120b06a47eb66e4a1a2a3acc209264244773faa3
+DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
+DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33
 DIST libuv-julia-0.3.0.tar.bz2 13541514 SHA256 8bd7461a316ed67928f9bd0a83e9c45083500c9784561647f12bc05629519e26 SHA512 405df88e102d7a9700ff5c691059283b0509c5236855cba1cccd042493a4deda9397d010e4d6d8a2df8dd03cb6e82597471271bb6f2a58855c6bc6fe84caffcd WHIRLPOOL a4610ff4382767e02b24922ec8a5e8f7c2df7f53f7710a9270f0b32f53b5b015de64d8f1f466066fe4ce2305adb2bf996c903edb58345ea8e232bd9dd5bc6cfb
 DIST rmath-0_p20140821.tar.bz2 455123 SHA256 39ea3c27d757b811caeb36d3f5c40ba908365752fbf74e5fdeed42964df09947 SHA512 22442852e6042fe8ce78252af7e88718a33774d0f34f26dafcd4313bb077f718801d207dded7c5c3368bc7554074fdf5975c615dc35ea0b28b071f2d8f91baf8 WHIRLPOOL dd6de751c46a8e5ca84cf00ba19951b4f1fcc6b80375861f9eeaeea6d15f48cec77661318edc6542ec0bafeb9b05b2be27f5c97173171427c84f48eb24310d7e
 DIST utf8proc-v1.1.6.tar.gz 105825 SHA256 fedc8fa78022eb8f0584fbc85c9f9571bcd7fd510de0ce16955289c42f4199e7 SHA512 3bec2388298c201d9d6992cdd36330f1109d26a37b3411ba633f006f40da9e494ba0565051b763a7d3014e6113cd1e7754e6b95d5cbb2d7b50cee55193f0fdc1 WHIRLPOOL c211419407e80893b66fa7586a8148e9b2e45c89d2d31878658a4ae7f0b1ca72e269cef234ca8b30e27e4bac5a48715520dd546f6605af773d6e165ef76f81b0
diff --git a/dev-lang/julia/files/julia-0.2.1-patchelf.patch b/dev-lang/julia/files/julia-0.2.1-patchelf.patch
deleted file mode 100644
index 663cf04b77db..000000000000
--- a/dev-lang/julia/files/julia-0.2.1-patchelf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- deps/Makefile       2014-06-25 15:57:04.618463213 +0800
-+++ deps/Makefile.new   2014-06-25 16:06:36.342318418 +0800
-@@ -42,14 +42,7 @@
- endif
- endif
- 
--ifeq ($(OS), Linux)
--ifneq ($(shell patchelf --version 2>/dev/null), patchelf 0.6)
--STAGE1_DEPS += patchelf
--PATCHELF=$(BUILD)/bin/patchelf
--else
- PATCHELF=patchelf
--endif
--endif
- 
- ## USE_SYSTEM_LIBS options
diff --git a/dev-lang/julia/files/julia-0.2.1-readline63.patch b/dev-lang/julia/files/julia-0.2.1-readline63.patch
deleted file mode 100644
index cc9ede53f392..000000000000
--- a/dev-lang/julia/files/julia-0.2.1-readline63.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS against readline 6.3
-Origin: backport, https://github.com/JuliaLang/julia/commit/d2552e0f03d1dc23d6bb0c89c39da3d73c7aa4e5
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741824
-Last-Update: 2014-03-16
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ui/repl-readline.c
-+++ b/ui/repl-readline.c
-@@ -831,7 +831,7 @@ void jl_init_repl(int history)
-     rl_instream = fopen("/dev/null","r");
-     prompt_length = 7;  // == strlen("julia> ")
-     init_history();
--    rl_startup_hook = (Function*)init_rl;
-+    rl_startup_hook = (rl_hook_func_t*)init_rl;
- }
- 
- static char *prompt_string=NULL;
diff --git a/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
new file mode 100644
index 000000000000..c83f0431d7df
--- /dev/null
+++ b/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
@@ -0,0 +1,140 @@
+diff --git a/Make.inc b/Make.inc
+index da01e38..c751607 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -297,7 +297,7 @@ JCFLAGS = -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS =
+ JCXXFLAGS = -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS = -O0 -ggdb3 -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS = -O3 -ggdb3 -falign-functions
++SHIPFLAGS = GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECLANG),1)
+@@ -307,7 +307,7 @@ JCFLAGS = -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS =
+ JCXXFLAGS = -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS = -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS = -O3 -g
++SHIPFLAGS =  GENTOOCFLAGS
+ ifeq ($(OS), Darwin)
+ ifeq ($(USE_LIBCPP), 1)
+ CC += -stdlib=libc++ -mmacosx-version-min=10.7
+@@ -334,7 +334,7 @@ JCFLAGS = -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -
+ JCPPFLAGS =
+ JCXXFLAGS = -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS = -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS = -O3 -g -falign-functions
++SHIPFLAGS = GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECCACHE), 1)
+diff --git a/deps/Makefile b/deps/Makefile
+index 051b23d..881ba68 100644
+--- a/deps/Makefile
++++ b/deps/Makefile
+@@ -862,7 +862,7 @@ OPENSPECFUN_TAR_URL = https://api.github.com/repos/JuliaLang/openspecfun/tarball
+ $(eval $(call git-external,openspecfun,OPENSPECFUN,Makefile,libopenspecfun.$(SHLIB_EXT)))
+ 
+ # issue 8799
+-OPENSPECFUN_CFLAGS = -O3 -std=c99
++OPENSPECFUN_CFLAGS = GENTOOCFLAGS -std=c99
+ ifeq ($(USEICC),1)
+   OPENSPECFUN_CFLAGS += -fp-model precise
+ endif
+@@ -902,7 +902,7 @@ DSFMT_OBJ_SOURCE = dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT)
+ 
+ DSFMT_CFLAGS = $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES
+ ifneq ($(USEMSVC), 1)
+-DSFMT_CFLAGS += -O3 -finline-functions -fomit-frame-pointer -fno-strict-aliasing \
++DSFMT_CFLAGS += GENTOOCFLAGS -finline-functions -fno-strict-aliasing \
+ 		--param max-inline-insns-single=1800 -Wmissing-prototypes -Wall  -std=c99 -shared
+ else
+ DSFMT_CFLAGS += -Wl,-dll,-def:../libdSFMT.def
+@@ -1181,7 +1181,7 @@ endif
+ endif
+ 
+ libgfortblas.$(SHLIB_EXT): gfortblas.c gfortblas.alias
+-	$(CC) -Wall -O3 $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
++	$(CC) -Wall GENTOOCFLAGS $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
+ 				-Wl,-reexport_framework,Accelerate -Wl,-alias_list,gfortblas.alias
+ $(build_shlibdir)/libgfortblas.$(SHLIB_EXT): libgfortblas.$(SHLIB_EXT)
+ 	cp -f $< $@
+@@ -1607,10 +1607,10 @@ install-suitesparse: $(SUITESPARSE_OBJ_TARGET) install-suitesparse-wrapper
+ # SUITESPARSE WRAPPER
+ 
+ ifeq ($(USE_SYSTEM_SUITESPARSE), 1)
+-SUITESPARSE_INC = -I /usr/include/suitesparse
++
+ SUITESPARSE_LIB = -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
+ else
+-SUITESPARSE_INC = -I SuiteSparse-$(SUITESPARSE_VER)/CHOLMOD/Include -I SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse_config -I SuiteSparse-$(SUITESPARSE_VER)/SPQR/Include
++
+ SUITESPARSE_LIB = -L$(build_shlibdir) -lcholmod -lumfpack -lspqr $(RPATH_ORIGIN)
+ $(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT):  $(SUITESPARSE_OBJ_TARGET)
+ endif
+diff --git a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512 b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
+index 6a64d44..6bbeb34 100644
+--- a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
++++ b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
+@@ -1 +1 @@
+-1dd94eca05bc06c3f33e8be5087d3b1742d01c8b38588e0fa79b8f6b9998760bca21bee1b65873825c4dde2d994a8271166bc21f670a34810fa9db598473a887
++15da0b3ff16113d5ad44c7ec42a1c8e260973883dd85ee174b3526f01137a94136cb03d4bbecb9267b7ca20d5ffc10670496d589cf60b86930f869a9fe219794
+diff --git a/doc/Makefile b/doc/Makefile
+index 08ba8dd..078d725 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -56,7 +56,7 @@ help:
+ 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+ 
+ clean:
+-	-rm -rf _build/*
++	@echo "Do not clean doc/_build/html. Just use it..."
+ 
+ cleanall: clean
+ 
+diff --git a/src/Makefile b/src/Makefile
+index 98fa704..b566791 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -26,15 +26,8 @@ endif
+ 
+ # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
+ # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs 2> /dev/null)
+-ifeq ($(USE_LLVM_SHLIB),1)
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
+-else
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
+-endif
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+ FLAGS += -DLLVM_SHLIB
+-endif
+ 
+ COMMON_LIBS = -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
+ DEBUG_LIBS = $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
+diff --git a/ui/Makefile b/ui/Makefile
+index c9b5d0e..557a38c 100644
+--- a/ui/Makefile
++++ b/ui/Makefile
+@@ -20,15 +20,10 @@ OBJS = $(SRCS:%=%.o)
+ DOBJS = $(SRCS:%=%.dbg.obj)
+ DEBUGFLAGS += $(FLAGS)
+ SHIPFLAGS += $(FLAGS)
+-ifeq ($(USE_LLVM_SHLIB),1)
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
+-else
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
+-endif
+-else
+-LLVMLINK =
+-endif
++
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
++FLAGS += -DLLVM_SHLIB
++
+ JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(OSLIBS) $(LLVMLINK) $(RPATH)
+ 
+ ifeq ($(USE_SYSTEM_LIBM),0)
diff --git a/dev-lang/julia/julia-0.2.0-r1.ebuild b/dev-lang/julia/julia-0.2.0-r1.ebuild
deleted file mode 100644
index 02596c5e06d1..000000000000
--- a/dev-lang/julia/julia-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-inherit eutils multilib pax-utils
-
-DESCRIPTION="High-level, high-performance dynamic programming language for technical computing"
-
-HOMEPAGE="http://julialang.org/"
-
-# uses gfortran in some places, dependencies don't reflect that yet
-
-# tarball remade because upstream lacks submodules, so it's not able to build
-# soo ... they bundle a split out part of v8 that has no build system that makes sense
-# double-conversion nailed in to make build system happy
-# dSFMT is not meant to be packaged
-SRC_URI="http://gentooexperimental.org/~patrick/${P}.tar.bz2
-	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.tar.gz -> dsfmt-2.2.tar.gz
-	https://double-conversion.googlecode.com/files/double-conversion-1.1.1.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-S="${WORKDIR}"
-
-# Avoid fragile duplication - see compile and install phases
-JULIAMAKEARGS="QUIET_MAKE= USE_SYSTEM_LLVM=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBM=1 \
-		USE_SYSTEM_GMP=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1  USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 \
-		LLVM_CONFIG=/usr/bin/llvm-config USE_BLAS64=0"
-
-# Disabling use of 64-bit integers. If you want 64-bit integers then you need to use a BLAS implementation from the
-# science overlay, and julia-9999 also from the science overlay.
-
-# scons is a dep of double-conversion
-DEPEND="
-	=sys-devel/llvm-3.3*
-	dev-lang/perl
-	sys-libs/readline
-	dev-libs/libpcre
-	dev-util/scons
-	dev-libs/gmp
-	sys-libs/libunwind
-	dev-util/patchelf
-	sci-libs/fftw
-	sys-libs/zlib
-	dev-libs/mpfr
-	sci-libs/suitesparse
-	sci-libs/arpack
-	virtual/lapack
-	virtual/blas
-	"
-RDEPEND="sys-libs/readline"
-
-src_prepare() {
-	#uurgh, no fetching in ebuild
-	sed -i -e 's~$(JLDOWNLOAD)~/bin/true~' deps/Makefile || die "Oopsie"
-	sed -i -e 's~git submodule~/bin/true~g' deps/Makefile || die "Ooopsie"
-	# and we need to build stuff, so ... let's just copy around and pray!
-	mkdir -p deps/random
-	cp "${DISTDIR}/dsfmt-2.2.tar.gz" deps/random/
-	cp "${DISTDIR}/double-conversion-1.1.1.tar.gz" deps/
-	# Detect what BLAS and LAPACK implementations are being used
-	local BLAS_LIB="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed 's/ .*$//')"
-	local LAPACK_LIB="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed 's/ .*$//')"
-	sed -e "s|-lblas|${BLAS_LIB}|" -i Make.inc || die
-	sed -e "s|libblas|${BLAS_LIB/-l/lib}.so|" -i Make.inc || die
-	sed -e "s|-llapack|${LAPACK_LIB}|" -i Make.inc || die
-	sed -e "s|liblapack|${LAPACK_LIB/-l/lib}.so|" -i Make.inc || die
-	sed -e "s|JL_PRIVATE_LIBDIR = lib/julia|JL_PRIVATE_LIBDIR = $(get_libdir)/julia|" \
-		-e "s|JL_LIBDIR = lib|JL_LIBDIR = $(get_libdir)|"  \
-		-e "s|/usr/lib|/usr/$(get_libdir)|" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		-i Make.inc || die
-	# Set version to package version instead of git commit number
-	sed -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" -i Make.inc || die
-	sed -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	mkdir -p usr/$(get_libdir) || die
-	pushd usr || die
-	ln -s $(get_libdir) lib || die
-	popd
-	emake $JULIAMAKEARGS julia-release || die
-	for i in usr/bin/julia-*
-	do
-		if file ${i} | grep ELF >/dev/null; then
-			pax-mark m ${i}
-		fi
-	done
-	emake $JULIAMAKEARGS || die
-	# makefile weirdness - avoid compile in src_install
-	emake $JULIAMAKEARGS debug || die
-}
-
-src_install() {
-	# config goes to /usr/etc/ - should be fixed
-	emake $JULIAMAKEARGS PREFIX="${D}/usr" install || die
-}
diff --git a/dev-lang/julia/julia-0.2.0.ebuild b/dev-lang/julia/julia-0.2.0.ebuild
deleted file mode 100644
index 26bb1b84fde9..000000000000
--- a/dev-lang/julia/julia-0.2.0.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=5
-
-inherit eutils
-
-DESCRIPTION="High-level, high-performance dynamic programming language for technical computing"
-
-HOMEPAGE="http://julialang.org/"
-
-# uses gfortran in some places, dependencies don't reflect that yet
-
-# tarball remade because upstream lacks submodules, so it's not able to build
-# soo ... they bundle a split out part of v8 that has no build system that makes sense
-# double-conversion nailed in to make build system happy
-# dSFMT is not meant to be packaged
-SRC_URI="http://gentooexperimental.org/~patrick/${P}.tar.bz2
-	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.tar.gz -> dsfmt-2.2.tar.gz
-	https://double-conversion.googlecode.com/files/double-conversion-1.1.1.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-S="${WORKDIR}"
-
-# Avoid fragile duplication - see compile and install phases
-JULIAMAKEARGS="QUIET_MAKE= USE_SYSTEM_LLVM=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBM=1 \
-		USE_SYSTEM_GMP=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1  USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 \
-		LLVM_CONFIG=/usr/bin/llvm-config"
-
-# scons is a dep of double-conversion
-DEPEND="
-	=sys-devel/llvm-3.3*
-	dev-lang/perl
-	sys-libs/readline
-	dev-libs/libpcre
-	dev-util/scons
-	dev-libs/gmp
-	sys-libs/libunwind
-	dev-util/patchelf
-	sci-libs/fftw
-	sys-libs/zlib
-	dev-libs/mpfr
-	sci-libs/suitesparse
-	sci-libs/arpack
-	virtual/lapack
-	virtual/blas
-	"
-RDEPEND="sys-libs/readline"
-
-src_prepare() {
-	#uurgh, no fetching in ebuild
-	sed -i -e 's~$(JLDOWNLOAD)~/bin/true~' deps/Makefile || die "Oopsie"
-	sed -i -e 's~git submodule~/bin/true~g' deps/Makefile || die "Ooopsie"
-	# and we need to build stuff, so ... let's just copy around and pray!
-	mkdir -p deps/random
-	cp "${DISTDIR}/dsfmt-2.2.tar.gz" deps/random/
-	cp "${DISTDIR}/double-conversion-1.1.1.tar.gz" deps/
-	# Some cleanups to avoid an OpenBlas dep, and remove some useless git errors
-	sed -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" Make.inc || die
-	sed -e 's/$(shell git rev-parse --short=10 HEAD)/v0.2.0/' Make.inc || die
-}
-
-src_compile() {
-	emake $JULIAMAKEARGS || die
-	# makefile weirdness - avoid compile in src_install
-	emake $JULIAMAKEARGS debug || die
-}
-
-src_install() {
-	# config goes to /usr/etc/ - should be fixed
-	emake $JULIAMAKEARGS PREFIX="${D}/usr" install || die
-}
diff --git a/dev-lang/julia/julia-0.2.1-r2.ebuild b/dev-lang/julia/julia-0.4.3.ebuild
index 642fd7978e91..f0b4381e02e2 100644
--- a/dev-lang/julia/julia-0.2.1-r2.ebuild
+++ b/dev-lang/julia/julia-0.4.3.ebuild
@@ -1,19 +1,18 @@
-# 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 elisp-common eutils multilib pax-utils toolchain-funcs
+RESTRICT="test"
 
-PDSFMT=dSFMT-src-2.2
+inherit elisp-common eutils multilib pax-utils toolchain-funcs
 
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="http://julialang.org/"
 SRC_URI="
-	https://github.com/JuliaLang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/${PDSFMT}.tar.gz
-	https://dev.gentoo.org/~bicatali/distfiles/libuv-${P}.tar.gz
+	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
 "
 
 LICENSE="MIT"
@@ -25,8 +24,9 @@ RDEPEND="
 	dev-lang/R:0=
 	dev-libs/double-conversion:0=
 	dev-libs/gmp:0=
-	dev-libs/libpcre:3=
+	dev-libs/libgit2:0=
 	dev-libs/mpfr:0=
+	dev-libs/openspecfun
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
 	sci-libs/cholmod:0=
@@ -35,7 +35,7 @@ RDEPEND="
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
-	=sys-devel/llvm-3.3*
+	>=sys-devel/llvm-3.5:0=
 	>=sys-libs/libunwind-1.1:7=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
@@ -47,32 +47,50 @@ DEPEND="${RDEPEND}
 	dev-util/patchelf
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_build_system.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-readline63.patch
-	epatch "${FILESDIR}"/${P}-patchelf.patch
-
-	ln -s "${DISTDIR}"/${PDSFMT}.tar.gz deps/random/dsfmt-2.2.tar.gz || die
-	rmdir deps/libuv && ln -s "${WORKDIR}"/libuv deps/libuv
-	# no fetching in ebuild
-	# /usr/include/suitesparse is for debian only
-	# respect prefix, flags
+	mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die
+	mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die
+	mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die
+	mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die
+	mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die
+	rmdir "${WORKDIR}"/bundled || die
+
+	epatch "${PATCHES[@]}"
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+	# - fix BLAS and LAPACK link interface
+
 	sed -i \
 		-e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
 		-e 's|git submodule|${EPREFIX}/bin/true|g' \
-		-e 's|^\(SUITESPARSE_INC\s*=\).*||g' \
-		-e "s|-O3|${CFLAGS}|g" \
-		-e 's|/usr/bin/||g' \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
 		deps/Makefile || die
 
+	local lblas="$($(tc-getPKG_CONFIG) --libs blas)"
+	lblas=${lblas%% *}
+	local llapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+	llapack=${llapack%% *}
+
 	sed -i \
 		-e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
-		-e "s|-O3|${CFLAGS}|g" \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
 		-e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
 		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+		-e "s|-lblas|${lblas}|" \
+		-e "s|= libblas|= lib${lblas#-l}|" \
+		-e "s|-llapack|${llapack}|" \
+		-e "s|= liblapack|= lib${llapack#-l}|" \
 		Make.inc || die
 
 	sed -i \
@@ -86,10 +104,14 @@ src_prepare() {
 }
 
 src_configure() {
-	# libuv is an incompatible fork from upstream, so don't use system one
+	# julia does not play well with the system versions of
+	# dsfmt, libuv, pcre2 and utf8proc
 	cat <<-EOF > Make.user
-		LIBLAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
-		LIBLAPACKNAME=$($(tc-getPKG_CONFIG) --libs lapack | sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
+		USE_SYSTEM_DSFMT=0
+		USE_SYSTEM_LIBUV=0
+		USE_SYSTEM_PCRE=0
+		USE_SYSTEM_RMATH=0
+		USE_SYSTEM_UTF8PROC=0
 		USE_LLVM_SHLIB=1
 		USE_SYSTEM_ARPACK=1
 		USE_SYSTEM_BLAS=1
@@ -97,29 +119,26 @@ src_configure() {
 		USE_SYSTEM_GMP=1
 		USE_SYSTEM_GRISU=1
 		USE_SYSTEM_LAPACK=1
+		USE_SYSTEM_LIBGIT2=1
 		USE_SYSTEM_LIBM=1
 		USE_SYSTEM_LIBUNWIND=1
-		USE_SYSTEM_LIBUV=0
 		USE_SYSTEM_LLVM=1
 		USE_SYSTEM_MPFR=1
 		USE_SYSTEM_OPENLIBM=1
-		USE_SYSTEM_PCRE=1
+		USE_SYSTEM_OPENSPECFUN=1
+		USE_SYSTEM_PATCHELF=1
 		USE_SYSTEM_READLINE=1
-		USE_SYSTEM_RMATH=1
 		USE_SYSTEM_SUITESPARSE=1
 		USE_SYSTEM_ZLIB=1
 		VERBOSE=1
 	EOF
+
 }
 
 src_compile() {
-	# Not parallel-safe, #514882
-	emake -j1 cleanall
-	if [[ $(get_libdir) != lib ]]; then
-		mkdir -p usr/$(get_libdir) || die
-		ln -s $(get_libdir) usr/lib || die
-	fi
-	emake -j1 julia-release
+	emake cleanall
+	emake julia-release \
+		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
 	emake
 	use emacs && elisp-compile contrib/julia-mode.el
@@ -130,7 +149,8 @@ src_test() {
 }
 
 src_install() {
-	emake install PREFIX="${ED}/usr"
+	emake install \
+		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF
@@ -141,6 +161,17 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
 	fi
 	dodoc README.md
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	rmdir "${ED}"/usr/libexec || die
+	mv "${ED}"/usr/share/doc/julia/{examples,html} \
+		"${ED}"/usr/share/doc/${P} || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+	if [[ $(get_libdir) != lib ]]; then
+		mkdir -p "${ED}"/usr/$(get_libdir) || die
+		mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/dev-lang/luajit/luajit-2.0.4.ebuild b/dev-lang/luajit/luajit-2.0.4.ebuild
index ed954241d1f7..8ff72c4bc286 100644
--- a/dev-lang/luajit/luajit-2.0.4.ebuild
+++ b/dev-lang/luajit/luajit-2.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/php/php-5.5.31.ebuild b/dev-lang/php/php-5.5.31.ebuild
index bd5d9b127ddc..79743c4865c8 100644
--- a/dev-lang/php/php-5.5.31.ebuild
+++ b/dev-lang/php/php-5.5.31.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.6.17.ebuild b/dev-lang/php/php-5.6.17.ebuild
index 1306cd3febac..f968777bbc32 100644
--- a/dev-lang/php/php-5.6.17.ebuild
+++ b/dev-lang/php/php-5.6.17.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild b/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
index 1b64ec6dfe1a..de1ef4e94434 100644
--- a/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
+++ b/dev-lang/tuprolog/tuprolog-2.4.0_rc5.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tuprolog/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=">=virtual/jdk-1.5
diff --git a/dev-lang/tuprolog/tuprolog-2.5.0.ebuild b/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
index 2d96f8135f70..011c8f545ca5 100644
--- a/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
+++ b/dev-lang/tuprolog/tuprolog-2.5.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND=">=virtual/jdk-1.5
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 7f1d707df579..269af04c601f 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,2 +1,3 @@
 DIST geoip-1.6.6.tar.gz 156796 SHA256 db8ed5d07292c75cb3018738e6411037f15cc2a517f38ee04c1232cbe3d30b46 SHA512 4cdd308500bcb827b3dd1c6d981299ea746251758b6a5df97bf2cf098b62b0a736394d5853a06c62437eb0808cb54efb14d0579f5212284f29016e3c8cdd9846 WHIRLPOOL 518749339b094c4166ab53d8ec38020c72f1550923e8c0084f438391dfe7965a9b2f7b3e27ef5ecac85a3f62aa14299e11fbd740ea103c320eef5fad357994b2
 DIST geoip-1.6.7.tar.gz 158276 SHA256 6f0ee5cd63660a2ab3a8f30df8e7246ee87b0eb33c719843d691c8d010cbabb5 SHA512 dde9ef65328297604892533ef5d5b568184eb4a29ff95839cb5e39b6652bcfbc53bf64fbcc3b55dad43cf0fca16f5611dbd96ba50f3001d8e212392304bce0b5 WHIRLPOOL 2d7e3b94317aa820c55c08be1808b9cc6d8cc38e87733cb1da3c9b3a5bf51212933e266ca105aabd765a08fe87f79f22eae5d8c6e3015a43fc923637273d6795
+DIST geoip-1.6.9.tar.gz 158576 SHA256 05468adbb6bdbddc588ee6f0df990f47b1b24d278519c35d59f7a8058a2a9825 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976 WHIRLPOOL 4b4a4e4dff60f3b9db456d54b5529c24c93b3e18c4aff0d67d35165e9092fcd7e163ce868f729140f9ee5e3a8f49c19ff8a7324f1b106fd9a81a7896d92288ae
diff --git a/dev-libs/geoip/geoip-1.6.9.ebuild b/dev-libs/geoip/geoip-1.6.9.ebuild
new file mode 100644
index 000000000000..445952bd2f0a
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.6.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="GeoIP Legacy C API"
+HOMEPAGE="https://github.com/maxmind/geoip-api-c"
+SRC_URI="
+	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
+LICENSE="LGPL-2.1 GPL-2 MaxMind2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="net-misc/wget"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-api-c-${PV}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r5.sh > geoipupdate.sh || die
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS.md README*
+
+	prune_libtool_files
+
+	keepdir /usr/share/GeoIP
+
+	dosbin geoipupdate.sh
+}
+
+pkg_postinst() {
+	ewarn "WARNING: Databases are no longer installed by this ebuild."
+	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
+	elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/"
+	elog "with geo-located IP address databases."
+}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
index b9d50dbe2177..900fdce53119 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
index 09db05f5b02f..524b1c59cff8 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index 07e1e0a78e25..34894b9b6e8e 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="blas"
 
 RDEPEND="
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2
index b3f6cedfbec8..0528c1c15b39 100755
--- a/dev-libs/openssl/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2
@@ -108,8 +108,13 @@ linux)
 	#	sh64*)        machine=elf;;
 		sh*b*)        machine="generic32 -DB_ENDIAN";;
 		sh*)          machine="generic32 -DL_ENDIAN";;
+		# TODO: Might want to do -mcpu probing like glibc to determine a
+		# better default for sparc-linux-gnu targets.  This logic will
+		# break v7 and older systems when they use it.
 		sparc*v7*)    machine="generic32 -DB_ENDIAN";;
-		sparc64*)     machine=sparcv9;;
+		sparc64*)     machine=sparcv9 system=linux64;;
+		sparc*v9*)    machine=sparcv9;;
+		sparc*v8*)    machine=sparcv8;;
 		sparc*)       machine=sparcv8;;
 		s390x*)       machine=s390x system=linux64;;
 		s390*)        machine="generic32 -DB_ENDIAN";;
diff --git a/dev-libs/qcodeedit/files/qcodeedit-2.2.3-fix-parallel-build.patch b/dev-libs/qcodeedit/files/qcodeedit-2.2.3-fix-parallel-build.patch
new file mode 100644
index 000000000000..4c1a5feb02fe
--- /dev/null
+++ b/dev-libs/qcodeedit/files/qcodeedit-2.2.3-fix-parallel-build.patch
@@ -0,0 +1,15 @@
+Add missing edges to dependency graph in order to
+allow for parallel building.
+
+--- qcodeedit-2.2.3/qcodeedit.pro
++++ qcodeedit-2.2.3/qcodeedit.pro
+@@ -4,6 +4,9 @@
+ 

+ SUBDIRS += lib example designer-plugin

+ 

++example.depends = lib

++designer-plugin.depends = lib

++

+ CONFIG(debug, debug|release) {

+ 	# placeholder

+ 	QCODE_EDIT_EXTRA_DEFINES += _DEBUG_BUILD_

diff --git a/dev-libs/qcodeedit/qcodeedit-2.2.3-r2.ebuild b/dev-libs/qcodeedit/qcodeedit-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..402461b4e8ed
--- /dev/null
+++ b/dev-libs/qcodeedit/qcodeedit-2.2.3-r2.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 qmake-utils
+
+DESCRIPTION="Qt-Framework for code editing"
+HOMEPAGE="http://edyuk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/edyuk/${PN}/${PV}/${P}.zip"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	dev-qt/qtxmlpatterns:4
+	dev-qt/designer:4
+"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-parallel-build.patch"
+)
+
+src_configure() {
+	eqmake4 ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dolib.so libqcodeedit.so*
+}
diff --git a/dev-perl/Apache-Reload/Apache-Reload-0.120.0-r1.ebuild b/dev-perl/Apache-Reload/Apache-Reload-0.120.0-r1.ebuild
deleted file mode 100644
index ab1e8c719a81..000000000000
--- a/dev-perl/Apache-Reload/Apache-Reload-0.120.0-r1.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
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="Perl module for Apache::Reload"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="www-apache/mod_perl"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild b/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
index cc4318b2842e..de4b1c817e9e 100644
--- a/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
+++ b/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl module for Apache::Reload"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="www-apache/mod_perl"
diff --git a/dev-perl/Apache-Reload/Manifest b/dev-perl/Apache-Reload/Manifest
index bf53f9bb270e..7616d3e14e7a 100644
--- a/dev-perl/Apache-Reload/Manifest
+++ b/dev-perl/Apache-Reload/Manifest
@@ -1,2 +1 @@
-DIST Apache-Reload-0.12.tar.gz 19015 SHA256 f688ab7ab8f5d315d1ade235111fc475ebeb98bb688cd9f1bc0ccd88a6dda219 SHA512 579b5c9a43cb430bcc96b33abec42b813132d1d7937945886a3bbb29b045073c7184f652b25c082fb9f6eea6d72ca5facd865fc8833b80eed3b7671d4ddefd94 WHIRLPOOL 076d86e12585c1b292eda165a90c9acd23a384d7942b86d3bbbf12dd849a21f2e311c366f2fea724532dd44f85e131475ccc154905f59dd1a2541b9f4d908e80
 DIST Apache-Reload-0.13.tar.gz 18908 SHA256 c8d0bfc1c18f0f0de39f4ad7f374f1a66a22daa3d1120f6deac2b8c550aa296a SHA512 7209fbd682093cca5f724050ee71d8bd26d101c3edfedb2cdaaf2e09df903e1f12cdf5cb6f4717eb8814802924359a01c89657dd5769f94c46d064db30c9f7e2 WHIRLPOOL 992e7f9bb1a08087721a5b4fb547cb725e488e22bcb16588627c035e38eb27df1f6eda7d6e603c62de255aa921ecd3b2d0354484739d4d3854b4c7cc6c579e6a
diff --git a/dev-perl/Apache-Session/Apache-Session-1.900.0-r1.ebuild b/dev-perl/Apache-Session/Apache-Session-1.900.0-r1.ebuild
deleted file mode 100644
index faca6b6d360d..000000000000
--- a/dev-perl/Apache-Session/Apache-Session-1.900.0-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
-
-MODULE_AUTHOR=CHORNY
-MODULE_VERSION=1.90
-inherit perl-module
-
-DESCRIPTION="Perl module for Apache::Session"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Storable"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-"
-#	test? (
-#		dev-perl/Test-Deep
-#		dev-perl/Test-Exception
-#	)
diff --git a/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild b/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
index ae7cb020b1d2..925b4915d2a2 100644
--- a/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
+++ b/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A persistence framework for session data"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Apache-Session/Manifest b/dev-perl/Apache-Session/Manifest
index f497c499db16..37e87288209a 100644
--- a/dev-perl/Apache-Session/Manifest
+++ b/dev-perl/Apache-Session/Manifest
@@ -1,2 +1 @@
-DIST Apache-Session-1.90.tar.gz 48643 SHA256 26ab8ba2fc3f09e7c67ab69d147e5c73813e4df8cda6cfe6cb375f0695353eb1 SHA512 c60f0e61b7839a8975b11439e54478321353eac637ba8d812af8d62f46ab16574f8d0a8caf9579ec68fc82b8147ec03cf8b90ad6fda0e83c0439036639a97108 WHIRLPOOL 4b300624879f959dc9e82816c605fa647090d5151af91d95a1e585302527792c9ce82910e332b1aa25a310e6c713e84ec498911e62813a61cca263ee9b00ae56
 DIST Apache-Session-1.93.tar.gz 49995 SHA256 8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d SHA512 568653b5151df61dbbc4b034043e1d4be75642122ab920a13155c4abbe052e4d96915b1453eb9f2f06bd1159d95efef7ed5905b4d2f2b8c6fdd3711d0cf5dbe4 WHIRLPOOL b3f7c327f44b58dd57797ff288921e968ba7ad7451f59d0f9545f24f4960f783c862b87663cdbe2f8738ac0ab28412f27379e2aac14685e293b70ee2bd8e9596
diff --git a/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild b/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
index 3cc8a6ac1a43..56f51e8aab0a 100644
--- a/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
+++ b/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Modules for reading & writing Microsoft WAV files"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
index 65e669854118..7d16ebb4b8e9 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils db-use
 DESCRIPTION="This module provides Berkeley DB interface for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # Install DB_File if you want older support. BerkleyDB no longer
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
index 5f922b7287de..08c27ead2d71 100644
--- a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Efficient bit vector, set of integers and big int math library"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
index 5b8058981a68..27a5d3b73da6 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl API for memcached"
 HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-perl/string-crc32"
diff --git a/dev-perl/Cairo/Cairo-1.106.0.ebuild b/dev-perl/Cairo/Cairo-1.106.0.ebuild
index 284cb3228ede..1414850d2cd0 100644
--- a/dev-perl/Cairo/Cairo-1.106.0.ebuild
+++ b/dev-perl/Cairo/Cairo-1.106.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
 
 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="test"
 
 RDEPEND="
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
index f5550eb51196..42591ec49cda 100644
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module eutils
 DESCRIPTION="Create generic methods for OO Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/Clone/Clone-0.380.0.ebuild b/dev-perl/Clone/Clone-0.380.0.ebuild
index f8f4c6dfcfe0..8c2efb0d3c9a 100644
--- a/dev-perl/Clone/Clone-0.380.0.ebuild
+++ b/dev-perl/Clone/Clone-0.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
index ca43737d9b01..571b8e265531 100644
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extract data from Macintosh BinHex files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
index 07542dd1a71a..30c74b827213 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="OpenSSL support for LWP"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/dev-perl/Curses/Curses-1.320.0.ebuild b/dev-perl/Curses/Curses-1.320.0.ebuild
index bfa77f832d67..c8180724acff 100644
--- a/dev-perl/Curses/Curses-1.320.0.ebuild
+++ b/dev-perl/Curses/Curses-1.320.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Curses interface modules for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="+unicode"
 
 DEPEND=">=sys-libs/ncurses-5:0=[unicode?]"
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
index 9d52b14914e4..80edd830b38a 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="virtual/perl-version
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
index 0e8137f66e08..0e75b8fc76db 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
index f32b487fffe5..9bd585bed70c 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit eutils perl-module
 DESCRIPTION="The Perl DBD:mysql Module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="embedded test"
 
 RDEPEND="dev-perl/DBI
diff --git a/dev-perl/DBI/DBI-1.634.0.ebuild b/dev-perl/DBI/DBI-1.634.0.ebuild
index 5d24f4a8919d..206684f32c3a 100644
--- a/dev-perl/DBI/DBI-1.634.0.ebuild
+++ b/dev-perl/DBI/DBI-1.634.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils
 DESCRIPTION="Database independent interface for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild
index 80106e5e6849..547251587381 100644
--- a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild
+++ b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change nature of data within a structure"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Data-UUID/Data-UUID-1.217.0-r1.ebuild b/dev-perl/Data-UUID/Data-UUID-1.217.0-r1.ebuild
deleted file mode 100644
index 7e02869ab759..000000000000
--- a/dev-perl/Data-UUID/Data-UUID-1.217.0-r1.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
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=1.217
-inherit perl-module
-
-DESCRIPTION="Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/perl-Digest-MD5"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
index 0f65d991dba6..e78a91e9c940 100644
--- a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
+++ b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Data-UUID/Manifest b/dev-perl/Data-UUID/Manifest
index 3965745b2cf4..eac19cf6fc9a 100644
--- a/dev-perl/Data-UUID/Manifest
+++ b/dev-perl/Data-UUID/Manifest
@@ -1,2 +1 @@
-DIST Data-UUID-1.217.tar.gz 15907 SHA256 18c0c41998b211b4249102367400d2d3aa7df479c3a3368a32c0d6c0299bfe6d SHA512 b6920f6a4519d1249823d0aa17e622b9e098c8669aaf8361440d8d8531582530ef0c6cd365f0919b272880a69e2b833b8337f480c30276cf4a75088a3d758030 WHIRLPOOL 1a54497a55bcacc4d60639b3e2b4df0aad03c498c44e32f61c7e9bf685a88638138bf3e794073beac87ebc62e78f4d1385fcd1ed54b1dfeaefbd8e5b5c6cc63f
 DIST Data-UUID-1.221.tar.gz 17041 SHA256 3cc7b2a3a7b74b45a059e013f7fd878078500ea4b7269036f84556b022078667 SHA512 fa40219890f9adeb486a7ff636603d8695d81765ee858e396130100aaba96b524d80eef76e0c06eac2086fe3bb2d26114d94459466d29ddc82a7a7fcb2f5adac WHIRLPOOL 1aff0953df75d0fa6906b3473b618af4fc4f89651c4eeaaf9f9ea319629a390984555b1873faff2a502251ac05a294c27a9574037042778a250872eafe950fba
diff --git a/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
index c8f2ed25cb0b..a08fb904469d 100644
--- a/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
+++ b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Gregorian calendar date calculations"
 
 LICENSE="${LICENSE} LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/DateTime/DateTime-1.200.0.ebuild b/dev-perl/DateTime/DateTime-1.200.0.ebuild
index 0edbe9ec3804..3d2782845f2f 100644
--- a/dev-perl/DateTime/DateTime-1.200.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.200.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A date and time object"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
index a13b4f48fd90..ab7ec609e6d4 100644
--- a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
+++ b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Meatier versions of caller"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE=""
 
 DEPEND="dev-perl/PadWalker"
diff --git a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
index 69cabb7b5bb2..2013bd49c946 100644
--- a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
+++ b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Alias lexical variables"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE=""
 
 DEPEND=">=dev-perl/Devel-Caller-2.03"
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
index 0f20165a87e1..3ce53cea1198 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Generic CRC function"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
index 2c49c3271c44..6934e21d8f28 100644
--- a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="safely and cleanly create closures via string eval"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc x86 ~x86-fbsd ~x64-macos"
 IUSE="test minimal"
 
 # Scalar::Util -> Scalar-List-Utils
diff --git a/dev-perl/Event/Event-1.210.0.ebuild b/dev-perl/Event/Event-1.210.0.ebuild
deleted file mode 100644
index d1d1561a77ef..000000000000
--- a/dev-perl/Event/Event-1.210.0.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
-
-MODULE_AUTHOR=JPRIT
-MODULE_VERSION=1.21
-inherit perl-module
-
-DESCRIPTION="fast, generic event loop"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
-
-mydoc="ANNOUNCE INSTALL TODO Tutorial.pdf"
diff --git a/dev-perl/Event/Event-1.240.0.ebuild b/dev-perl/Event/Event-1.240.0.ebuild
index bb3f2bc1c524..6b67b24dbfad 100644
--- a/dev-perl/Event/Event-1.240.0.ebuild
+++ b/dev-perl/Event/Event-1.240.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Fast, generic event loop"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Event/Manifest b/dev-perl/Event/Manifest
index da2fa07192e2..f393bd76ded3 100644
--- a/dev-perl/Event/Manifest
+++ b/dev-perl/Event/Manifest
@@ -1,2 +1 @@
-DIST Event-1.21.tar.gz 253340 SHA256 66ef435bdaf471c64a19f3afbdc0cbf71705a4ebd818f352e5d94082e84055d7 SHA512 9e2ba21d88bd841fd8a2ad6d9f42a29f6a30f47b21f0407dde2b66e9e48dfd04dcba30301e3df8e1bb15edd479e23b1cd43a821ecface4139606e8afc78ef08a WHIRLPOOL d0c89a191ad813a2e3ce7d59e8cb2efcd016ef6b426c34a148ee999587e3e840063d84e127c468e62eb95932845aebb73abfd85b21505cf49036013d0d770ea4
 DIST Event-1.24.tar.gz 254789 SHA256 8a7ff96b6f058f2f2b45e5eef8438dcc335151571c274ae2bdbe2d91abb36d7e SHA512 5e6a54f74117fd47f4ef29b65e3432fe1b87fd6f61a8a11143116a13f14c42f070a178777415d89e710e757ccb69eb0777a1a6b8d95adf8bcfffb2fd762307b2 WHIRLPOOL c7c7e6442f7eb08ad06d641117a7ea2b53281887764fe4b1d825d2204bc11bed0cbb2a22ff95e7056178c04c35b2db91c16e29f039ddec7fdde8cf2dc2712814
diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild
index 1c57be843eec..7be42d2d4de2 100644
--- a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild
+++ b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="XS for C++"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/FCGI/FCGI-0.740.0-r1.ebuild b/dev-perl/FCGI/FCGI-0.740.0-r1.ebuild
deleted file mode 100644
index 3c28e6f7a173..000000000000
--- a/dev-perl/FCGI/FCGI-0.740.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FLORA
-MODULE_VERSION=0.74
-inherit perl-module
-
-DESCRIPTION="Fast CGI"
-
-LICENSE="FastCGI"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/FCGI/FCGI-0.770.0.ebuild b/dev-perl/FCGI/FCGI-0.770.0.ebuild
index 0ffd7611b006..2bec65e9a7a9 100644
--- a/dev-perl/FCGI/FCGI-0.770.0.ebuild
+++ b/dev-perl/FCGI/FCGI-0.770.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast CGI module"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/FCGI/Manifest b/dev-perl/FCGI/Manifest
index 13e13c0cc9a3..efcf7e475408 100644
--- a/dev-perl/FCGI/Manifest
+++ b/dev-perl/FCGI/Manifest
@@ -1,2 +1 @@
-DIST FCGI-0.74.tar.gz 97599 SHA256 f59e46f6de960a67f7d15003504b2df6cb10511bb172f1904753df79004e0854 SHA512 f650d78c19ff7648c307c869df19abe87f4bfe4863972ea22b649b39a146c5a9b11ed434a5dd58583b83580dbf62600cb17697385243c8ffba9d53daf0dc7c6b WHIRLPOOL 443adefa257b9bb72f16f0a4f79b0835853e74c50d21ab856efa4ba38f81893609b6e57324be79562d64592b278e254f3e11b28af77fb7b065d1ce00524b8de5
 DIST FCGI-0.77.tar.gz 90561 SHA256 352cdfe3309d77c2815aa18fe7fbd9b4be68e8b1b26d062039e78f8664aa25a8 SHA512 8586b6bb675aebc04eaa8b56fb762c292fe9f991083c447cbe0ba9ac943cd3e6e56853ba732cac9a6e3bfe8eb0767719794351ad3bce9550bc2df516819f47f4 WHIRLPOOL 21f42d5e38cecefcd2fba013e7b9795b3232c71d2df1af518406602d683feede9a1d5ecd3a810ebd958b60442fa191572d9e8110b3e804ae6f6b87be0d111b15
diff --git a/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild b/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild
index 05db5ccd8ad2..a98b98955e43 100644
--- a/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild
+++ b/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="flock() wrapper.  Auto-create locks"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 SRC_TEST="do"
diff --git a/dev-perl/File-Map/File-Map-0.560.0.ebuild b/dev-perl/File-Map/File-Map-0.560.0.ebuild
deleted file mode 100644
index 7cbce2fce9c3..000000000000
--- a/dev-perl/File-Map/File-Map-0.560.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=LEONT
-MODULE_VERSION=0.56
-inherit perl-module
-
-DESCRIPTION="Memory mapping made simple and safe"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Const-Fast
-	dev-perl/PerlIO-Layers
-	>=dev-perl/Sub-Exporter-Progressive-0.1.5
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/Test-Exception
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Warn
-	)
-"
-SRC_TEST=do
diff --git a/dev-perl/File-Map/File-Map-0.640.0.ebuild b/dev-perl/File-Map/File-Map-0.640.0.ebuild
index 7038916839c5..8b705be1450b 100644
--- a/dev-perl/File-Map/File-Map-0.640.0.ebuild
+++ b/dev-perl/File-Map/File-Map-0.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Memory mapping made simple and safe"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-Map/Manifest b/dev-perl/File-Map/Manifest
index 080094cd8e56..b69b7225f5c6 100644
--- a/dev-perl/File-Map/Manifest
+++ b/dev-perl/File-Map/Manifest
@@ -1,2 +1 @@
-DIST File-Map-0.56.tar.gz 73947 SHA256 960d614c038e2fb74d4a14543b82e6158d7d7e296a3acbe6a683c3280c73e535 SHA512 e9ab48c525fde25207866e69894c0ffa4e71bd213f5dd39e1b423ace62376c10c83c862693d84860b91e57cea4c275dc0f7f52650f32ad5e3087feb6b6312d68 WHIRLPOOL 9fe0ace81d5f28958984860a70c0497e879cd9c7e5945658041ef1ec10199fc4050f80b26e328480d127471314fe342c9911a6f15b783bae62c935b05d2cdc99
 DIST File-Map-0.64.tar.gz 78083 SHA256 03e42eb2de185b1e257c7a0ed9761a20b7d51f522464c713b20f43d47491a8c9 SHA512 dc1182e79d20e835e19c78f5187dd108b45938209933a7074674d472ac300277fc1fb7604b023ad7d3456ef5837bb8274a94e1cac79f95f2a2235855c59d3809 WHIRLPOOL 1e0d887f51f652d9aa8938c83e5c7d2fe68676de94306f90f6a7a5d5de778532e751351a2fbce40ca38b6f09a6cc9e6593a63e02b087baf646bf12b2aa6af942
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.210.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.210.0.ebuild
deleted file mode 100644
index 6731703089f8..000000000000
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.210.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MICHIELB
-MODULE_VERSION=0.21
-inherit perl-module
-
-DESCRIPTION="Determine file type"
-
-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"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/File-BaseDir-0.03
-	>=dev-perl/File-DesktopEntry-0.04
-	x11-misc/shared-mime-info
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild
index 4eb9bbdc4355..ba199252718f 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Determine file type"
 
 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"
+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"
 IUSE="test"
 
 RDEPEND=">=dev-perl/File-BaseDir-0.03
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index 162128cca260..224b3948a8d8 100644
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -1,2 +1 @@
-DIST File-MimeInfo-0.21.tar.gz 31334 SHA256 40409cc35cdea0a09b47f410113eb247dfe96fd4530a5fea2dee294914a1f58e SHA512 6e8d911744ebd1dac30eff0b5b1f266743e5539d7b176832e7af2d6988813b1eda757938d1b240b0bc6cc0e358b986ca9ad35d81ecb59afb8de63f6565c1ee2d WHIRLPOOL ff01773664b10a4d9010474c2655cfa3d0a3196c6edb569887cc5faa11c1c1752c6d7ce29922a1f780f3e52abb13a2a36da9eca9226ebb4768193c77f35f0164
 DIST File-MimeInfo-0.27.tar.gz 30814 SHA256 579cf826fed7fe276636531a53291550c9ac36781dcd9e07e52ee7e784667234 SHA512 0be5b23d96291f792ac3190e38183021b0905870185979f11edc27ebb6fd0fb4726e3fde129cd92e42305978e15acf745eed9d7d203851b7ee2392c7f1e9a5c2 WHIRLPOOL 714f52fcd03518b8448da714157839a6fee2c47111c7c4416de6bd48b3534d8234ab7da3af0b82f4c4dafb49726891085a5e79aa863292e80a80a5dceb215fea
diff --git a/dev-perl/File-NFSLock/File-NFSLock-1.210.0-r1.ebuild b/dev-perl/File-NFSLock/File-NFSLock-1.210.0-r1.ebuild
deleted file mode 100644
index 41d564d970aa..000000000000
--- a/dev-perl/File-NFSLock/File-NFSLock-1.210.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BBB
-MODULE_VERSION=1.21
-inherit perl-module
-
-DESCRIPTION="NFS compatible (safe) locking utility"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/File-NFSLock/File-NFSLock-1.270.0.ebuild b/dev-perl/File-NFSLock/File-NFSLock-1.270.0.ebuild
index 4c19770030ee..39debdf92514 100644
--- a/dev-perl/File-NFSLock/File-NFSLock-1.270.0.ebuild
+++ b/dev-perl/File-NFSLock/File-NFSLock-1.270.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="perl module to do NFS (or not) locking"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/File-NFSLock/Manifest b/dev-perl/File-NFSLock/Manifest
index 0a87b501da9b..1b02afcff360 100644
--- a/dev-perl/File-NFSLock/Manifest
+++ b/dev-perl/File-NFSLock/Manifest
@@ -1,2 +1 @@
-DIST File-NFSLock-1.21.tar.gz 17301 SHA256 3fa65832c4cdb6f1a3bb9d79a5077ec7aee104fa34ab960896b10b057d8594cd SHA512 eefec56823247164adb60e2529487067a142754420b1ddd742eeb00587e2a2c5799131c61bd50d5fb576d7a3b3b431b31716984229c9a266ec36df8aeb37a3bd WHIRLPOOL ea5222e2c986aa82f69ce78dd466bf93f3dd4fab052ed59fac208ad44edd3b5c0ab0e432a011117a1c312774ab57c75984be6811cf905cc605226b76fe6e1115
 DIST File-NFSLock-1.27.tar.gz 21518 SHA256 0f41d6cfeaa44987221b38e31fa6862933ccc390bb11037b5828f9b52a1b1042 SHA512 06e6fe786691e3d07ed13761e4272906e2a170bfdcee15b185a6cd4cf78dfb1e40ad12c0a9733d7b071348c815e862f49865fe47bcf03ac8b8bda4a7316e5b0c WHIRLPOOL d436d8707a9978f64b6e0269ebbc9b5974c9d4e518a228de089128e99c6ad1cde95b9cfc371d19abc6ebd3a0d501f3303694efe68e49975d0af3a0a33444f73f
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
index 9e8632cb3312..fc3ee7ed3f0c 100644
--- a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://perlrsync.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="net-misc/rsync"
diff --git a/dev-perl/File-Sync/File-Sync-0.90.0-r1.ebuild b/dev-perl/File-Sync/File-Sync-0.90.0-r1.ebuild
deleted file mode 100644
index c919a919453a..000000000000
--- a/dev-perl/File-Sync/File-Sync-0.90.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=CEVANS
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Perl access to fsync() and sync() function calls"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/File-Sync/Manifest b/dev-perl/File-Sync/Manifest
index 84650291309d..93bcbea97c9f 100644
--- a/dev-perl/File-Sync/Manifest
+++ b/dev-perl/File-Sync/Manifest
@@ -1,2 +1 @@
-DIST File-Sync-0.09.tar.gz 4074 SHA256 3dbe1e568fe61e3ec49fa42eea97065d07982cd924f0bcb67603bac0bead46a3 SHA512 7fcc8af4e5582368f31deb126256b4de3e35bb9eb837acb2ffe1e6bb3d0fc14df025cb44198f18c7be6dceb04bec15c142adead811711e184f084bf3d85666c0 WHIRLPOOL 4c19768951429491bbc0db31c6ff3402e488462a62ded5183b3a830ec8b77a56976e16ccc8b66062cbd8eee6ed35406a31c1b364ca526f810419552ca233a05e
 DIST File-Sync-0.11.tar.gz 5842 SHA256 786698225e5cb43e8f061b78cfac1e0e7d48d370034ffdc518255207741c0b2a SHA512 32816efa26185f2f26d5a469aa48baf1d22242ec620b663e5fbfdda3ffb360e6d2e1c7349989fa34b8cd84567b7a312863dba2be855cd6e696f67759ef4512b6 WHIRLPOOL f904454179e4ed7bb3ed01fb6db8a5e1a6be487905bd8fdd41123f6d1c1366a8bb89980cd63462f5b10877efd5cea1dfb78f6674a7f1903e0862dd1f52b37530
diff --git a/dev-perl/File-Tail/File-Tail-0.99.3-r1.ebuild b/dev-perl/File-Tail/File-Tail-0.99.3-r1.ebuild
deleted file mode 100644
index a6b13315d8fb..000000000000
--- a/dev-perl/File-Tail/File-Tail-0.99.3-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
-
-inherit perl-module
-
-DESCRIPTION="Perl extension for reading from continously updated files"
-SRC_URI="mirror://cpan/authors/id/M/MG/MGRABNAR/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/~mgrabnar/"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/perl-Time-HiRes"
-
-export OPTIMIZE="$CFLAGS"
-mydoc="ToDo"
diff --git a/dev-perl/File-Tail/File-Tail-1.200.0.ebuild b/dev-perl/File-Tail/File-Tail-1.200.0.ebuild
index 2619331c9902..7dec29bb04cf 100644
--- a/dev-perl/File-Tail/File-Tail-1.200.0.ebuild
+++ b/dev-perl/File-Tail/File-Tail-1.200.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for reading from continously updated files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/File-Tail/File-Tail-1.300.0.ebuild b/dev-perl/File-Tail/File-Tail-1.300.0.ebuild
new file mode 100644
index 000000000000..b7099958b8a3
--- /dev/null
+++ b/dev-perl/File-Tail/File-Tail-1.300.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
+
+DIST_AUTHOR=MGRABNAR
+DIST_VERSION=1.3
+inherit perl-module
+
+DESCRIPTION="Perl extension for reading from continously updated files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/perl-Time-HiRes-1.120.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+mydoc="ToDo"
diff --git a/dev-perl/File-Tail/Manifest b/dev-perl/File-Tail/Manifest
index a2e91317b44d..38eee99627ed 100644
--- a/dev-perl/File-Tail/Manifest
+++ b/dev-perl/File-Tail/Manifest
@@ -1,2 +1,2 @@
-DIST File-Tail-0.99.3.tar.gz 22800 SHA256 0c29bae7f06587c5471bc8e9f5fc85a84a3fbe771e8a3380ccb7e18ce370b692 SHA512 8ecc2c7e6ed4a6d6578635034e66922c927d6965659606e6d9f8816d4ddefe441c3299126d713d4a5232d96042da8990bb4b2b2118333cc0871f1c4a8c0d44bc WHIRLPOOL 031106451f6ee97808973ed80078c40f59c5070cc7f4621620b8d55e8c55f2614c10ed22b72c989b1f3b89166ee571c4c74fb56521a8b9f40c7181573a888bfe
 DIST File-Tail-1.2.tar.gz 23978 SHA256 d68ac5fcebfb023e32617facccf2e13cfa07c65859660706c201c90614b2b114 SHA512 b94cd4fcfab0bb7a0f563ab1b03d705b45fab7fb2816250be33afb10a28ae228954f29b93c67afe344c4f54bf156ecec413f9841171239cea61cef30d6039bdf WHIRLPOOL 022293dab6bc8bcea1c212d19e3ce45b058bee500ce4b870ad679435b54353c54673248ee638cb4dd66b14af00e013c47e53df065b26dc7954d70465e054c0a7
+DIST File-Tail-1.3.tar.gz 24412 SHA256 26d09f81836e43eae40028d5283fe5620fe6fe6278bf3eb8eb600c48ec34afc7 SHA512 942f87880d0d8b79c521248cdbc449daafbd117a2a3700e2dbcc7fe7a6046e5783e8616b6c32de513f85a56663b63c4dde217e9e124216ba6a605c645db2bde9 WHIRLPOOL b8f87c8e37e4235cca07bfeb67782015c7e0e9d1df60a516bea80ea910ff3b1f94649a92ddd1d69c4240282c3853bd1f6e4aaba49e9602463f6c129f5f71689f
diff --git a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild
deleted file mode 100644
index d9f89aba8306..000000000000
--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DCOPPIT
-MODULE_VERSION=0.1623
-inherit perl-module versionator
-
-DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
index e1b063a6bb7b..500609d74073 100644
--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ia64 ppc sparc x86"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-Scalar-List-Utils-1.140.0"
diff --git a/dev-perl/FileHandle-Unget/Manifest b/dev-perl/FileHandle-Unget/Manifest
index a4a74cf8c444..e5cdc9be5725 100644
--- a/dev-perl/FileHandle-Unget/Manifest
+++ b/dev-perl/FileHandle-Unget/Manifest
@@ -1,2 +1 @@
-DIST FileHandle-Unget-0.1623.tar.gz 32166 SHA256 5f328639e5a7b6f7c2c26af8a10640747693aed63146f9ffda7a1aab14f85b9e SHA512 fa1554226a6fac5cba8d4f1b359d820990550700328907b8f606e69e9eed99d04e6899fc2048befb168227e374c3a4690180691b96e5beab36ee3dfa249480ae WHIRLPOOL 8fcc1c6f9cff5b6f8c10a775e24af31e3b86ca4e4c86def7510da43784bafc26229f68dddc8daf47457c195a935299de25ca8aa48010ee8f25800c125e44d984
 DIST FileHandle-Unget-0.1628.tar.gz 40259 SHA256 9ef4eb765ddfdc35b350905d8dd0a1e12139eabc586652811bfab41972100fdf SHA512 7c4aca0c7d22ab7091c19b7bc5876ed4f83ff961e49900e0ec70124cedc4e34109a31edf5180c6958772f85a021e2be6a8a9e69c393b495e413c24a8b2b6ff3f WHIRLPOOL 8980b1223a50a9b2266776fbb956ad254f9177590cbe98c2a317effd1b6233cd2f7841d2c81c4ba1a4f0af07c1e665a8908d6baa2fa08d6723ff21163b3decd3
diff --git a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.100.0.ebuild b/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.100.0.ebuild
deleted file mode 100644
index 798c57e51e38..000000000000
--- a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.100.0.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
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.10
-inherit perl-module
-
-DESCRIPTION="Simple and dumb file system watcher"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/Filter"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-perl/Test-SharedFork
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.80.0.ebuild b/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.80.0.ebuild
deleted file mode 100644
index 2ddab24ad135..000000000000
--- a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.80.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
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Simple and dumb file system watcher"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Filter"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.90.0.ebuild b/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.90.0.ebuild
deleted file mode 100644
index a1c86b32394f..000000000000
--- a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.90.0.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
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Simple and dumb file system watcher"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/Filter"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-perl/Test-SharedFork
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Filesys-Notify-Simple/Manifest b/dev-perl/Filesys-Notify-Simple/Manifest
index 4a6bf56cad20..2f0e8ad9c8ec 100644
--- a/dev-perl/Filesys-Notify-Simple/Manifest
+++ b/dev-perl/Filesys-Notify-Simple/Manifest
@@ -1,4 +1 @@
-DIST Filesys-Notify-Simple-0.08.tar.gz 48916 SHA256 f1756b682c38dea39ee382273f2b651136b9d640e8c0f07c85733914b7a75310 SHA512 fecdc3c6388ad50e4cdddb4c1a74a57089956559442c6c67ee72eb9c106336973b6f34803c0d8a52086db2e2deeb7b9d2f06a42736f66f2cbe1a83ac2166a5b6 WHIRLPOOL 9e8ff71b44aac02fe59e4835c9262c00aad90834a7e4a30eee07048ec50d5863fc13f0a2e281a5ec5354c0fd30cbbb4dcab7e6a858bad4c31c645ac3e6e28a58
-DIST Filesys-Notify-Simple-0.09.tar.gz 24047 SHA256 83cfe03fdc6ce527d421479005bb9b5fda383489b284774f5928a054237c58be SHA512 53d451faf93ec59e14d3df828e3e6471b06d99be4e5c3e9304d3db64f259698a90ba0530fe7877cf45d56d3e9e478f8d83590a6b9f016a8d82db73321a971d95 WHIRLPOOL 539c49c0d0c9834bb59a949d42919cb19abf27e30afb933aa6fb8b97096751507733728ebeb78589786c45f6cfb07382827caa865c97354d3da1f2c8f5c2d075
-DIST Filesys-Notify-Simple-0.10.tar.gz 24191 SHA256 b526ab0ceff0286a85f1fefb8be9e99c417971f710eb2f8fa3aad33e6028932b SHA512 ad09ee3b9c29466bfdbc66c61002df2003b34d2defdce67c796fe4a1c176d6c3bf59dc0e5c6f29b191e730c76fa64db06251b86de56e5272b0a0db9c4f324c10 WHIRLPOOL 0e74cbb083f0601af0dec00e739cedc10cc5f830f18a9fd3a7c43b7cd113ee8419b60bf388a37b7f02efaaa607ff97df7db8f8b08676dfa7ffd76df80499e87b
 DIST Filesys-Notify-Simple-0.12.tar.gz 12935 SHA256 ecafcdfdebd0706fdf1bb7ee1bbbc304a65d70c6cc05255d14fd133da6aca60d SHA512 3edb9a5087b82c87bea1b4092a3c7c264ec6f8da391052593e504b16392ea1a84771bbcbad21d623f727682cc6ab4474fe6a7e346c8bebe13f60d39e83594e2b WHIRLPOOL 4bd5cb5ec84c503e3f80e5937f212179fa02aac63555b5789835ae9b116689d58c0e522801d5b8968c5b2926cc764c37a66b968662d7d4020e65e36cd30f92ae
diff --git a/dev-perl/Filter/Filter-1.550.0.ebuild b/dev-perl/Filter/Filter-1.550.0.ebuild
new file mode 100644
index 000000000000..bf7655f64a57
--- /dev/null
+++ b/dev-perl/Filter/Filter-1.550.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
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=1.55
+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"
+IUSE=""
+
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Filter/Manifest b/dev-perl/Filter/Manifest
index 344f2e71d8a8..af2b9e720cf7 100644
--- a/dev-perl/Filter/Manifest
+++ b/dev-perl/Filter/Manifest
@@ -1,2 +1,3 @@
 DIST Filter-1.49.tar.gz 85905 SHA256 9bc5398ec7128b5f42aeae33f2c76e847b1ade7561e21b72d565563f2e1234a1 SHA512 edf23ad58d66e5a97f88befbd87c8c755f99fdeac0390d53dc5c28dd88d0c4c9582adac0febb9bd12955fac72ac9a7baade74768c632c2199e9ecf92a117b98f WHIRLPOOL 138499c207a730f55b6b2ef046b0b6e88b49cc62fc32e253851a5b581fda077b65bc7b8469fdc8149b18c30c1600fa923cbe146b24e7854266191e4b8e21e6e9
 DIST Filter-1.54.tar.gz 88008 SHA256 20bcd823c1739ccd3cb5b0170206b9804737cc2bb366a221a62f9d7810aa80d5 SHA512 57913e4a025709c8a12281a49dfe48dec81e5dec1af114ee885e983e86a622e456f49420aad02d55e8f9c93551208d442d90c0fe2de12722df9db820ed9a14bb WHIRLPOOL c9e1fe250819c587aa7d09dd2055c54067627ec5ab0b2a9d7bdc569f5df63c8e1d031ca071abac118df4083296f206ecb18b9f5f830f2ccde8c490cd55882622
+DIST Filter-1.55.tar.gz 89901 SHA256 7855f5f5f16777c14614b5d907794a170ed4cdeb4382bf03ffca825c8c6bc4a0 SHA512 df1a558fe10cbdc416a55961502332bf68e1b5bf97ce1f5080d1fe627c7f438c1a6bc0a06b21eaff2e3ea66b6c2595c81b418b4bee6eca1e306d2fc06a99446e WHIRLPOOL e016a0fceebc7468b7627916480c4eb2c1fcb7dcae2dc00cf7e3b5f1c31a3bf0f1937de1dd4659cdc0e1d4e8cb253fb8b759a42128a550f24825405a694f29ca
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.350.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.350.0.ebuild
deleted file mode 100644
index d2e8c7741c6f..000000000000
--- a/dev-perl/Finance-Quote/Finance-Quote-1.350.0.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
-
-MODULE_AUTHOR=ECOCODE
-MODULE_VERSION=1.35
-inherit perl-module
-
-DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-# virtual/perl-Data-Dumper currently commented out in the code
-
-RDEPEND="dev-perl/Crypt-SSLeay
-	dev-perl/Date-Calc
-	dev-perl/HTTP-Cookies
-	dev-perl/HTTP-Message
-	dev-perl/HTML-Tree
-	dev-perl/HTML-TableExtract
-	dev-perl/JSON
-	dev-perl/Mozilla-CA
-	dev-perl/libwww-perl"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod
-		dev-perl/Perl-Critic-Dynamic )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.380.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.380.0.ebuild
new file mode 100644
index 000000000000..be20f89205dd
--- /dev/null
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.380.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ECOCODE
+DIST_VERSION=1.38
+inherit perl-module
+
+DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+# virtual/perl-Data-Dumper currently commented out in the code
+
+RDEPEND="
+	dev-perl/CGI
+	virtual/perl-Carp
+	dev-perl/DateTime
+	virtual/perl-Encode
+	virtual/perl-Exporter
+	dev-perl/HTML-Parser
+	dev-perl/HTML-TableExtract
+	dev-perl/HTML-Tree
+	dev-perl/HTTP-Cookies
+	dev-perl/HTTP-Message
+	dev-perl/JSON
+	dev-perl/LWP-Protocol-https
+	dev-perl/libwww-perl
+	dev-perl/Mozilla-CA
+	virtual/perl-Time-Piece
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+		dev-perl/Test-Pod
+		dev-perl/Perl-Critic-Dynamic
+	)
+"
diff --git a/dev-perl/Finance-Quote/Manifest b/dev-perl/Finance-Quote/Manifest
index 1420524661d7..988c10f45747 100644
--- a/dev-perl/Finance-Quote/Manifest
+++ b/dev-perl/Finance-Quote/Manifest
@@ -1,3 +1,3 @@
 DIST Finance-Quote-1.18.tar.gz 147575 SHA256 4240faabe0646defd4ec76ca9e111977b9e8060eaec41adeb284eb422a428393 SHA512 7b5c910d7f424e9ab2b102dd1f7db20077e646512345f703b1ead235359d49d07a2a001aec9339cec35f7ab67c76bc8bfa572f2a5386878074c52ac952d39290 WHIRLPOOL 344407a5fa66068f6769147dfad2428d201c364588be6b5603ca3c61a78f8d3799899f39bb7edfdb8b7c506293eabd41985d3b7170f4f7afbce5d66eed00283f
-DIST Finance-Quote-1.35.tar.gz 254658 SHA256 3c0d22f18a65da2536b03d5dcbac178faaea8de71908ee0e2772b2664384ae57 SHA512 bf04da96dcf66a4789eb6ca76fa7b2c7ff5ec618e9ac69885c6c9eca6c1ef524c45adb4833c12b9fd7fa29c4ebc44f5a94d7733c3b49ff97cb14930c55ee563a WHIRLPOOL 1f6d67f0c7f789fadfe39330363e9487baa0cdfc4dca79e652373a347ae4df309546364bfe06ddb3cb515a9da780a76a6d2640afde17dc366b39a9683450ffce
 DIST Finance-Quote-1.37.tar.gz 251374 SHA256 6e1147e2e13ee27b223dffecf2f3bda5f85e10e8900247942ecb99e30e5cd7ac SHA512 ed58d27d1c14f7818871af4906c1b6109b3d353586bc348140120597199ed72d57b8939cebc95fa534e86ad7b9f9bf69bc4315db1d1cc1da5796aa9771697c51 WHIRLPOOL ee676ffcdceec66e2f5a12ddae7c9ed48426141313eba2a419ef884a1bd8ca326ba2a89e2db86cea9b82e7956b73fd314f2c52003428cabfb27a0b3af76d8801
+DIST Finance-Quote-1.38.tar.gz 327822 SHA256 a95427729e069095aab4cb7bcfa4072739417faa7c0a6d0eb1bd6de28f58187e SHA512 b55382d56ecf89eaf662f49ec6fd803e9e5e0163b63d3020ca3c875d4dff7607f502fa7600997c5db8d62fa671ea82e81597300443fc4b24bb3f94c80bd32439 WHIRLPOOL ef84399bf34541efebb74917f4e41db457e5949dfae71d27c55b8922b676dbbf5b3b8c53645e884f6d2b007ed75b1ca9e466f9b8c7e93d1478a9a707308dfd66
diff --git a/dev-perl/IO-Event/IO-Event-0.813.0.ebuild b/dev-perl/IO-Event/IO-Event-0.813.0.ebuild
index f48a09b6681a..c27bce93f9ce 100644
--- a/dev-perl/IO-Event/IO-Event-0.813.0.ebuild
+++ b/dev-perl/IO-Event/IO-Event-0.813.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Tied Filehandles for Nonblocking IO with Object Callbacks"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild b/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
index 1a5f0125b9e7..609e9f2a76c5 100644
--- a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform path specification manipulation"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
index 8917964e2253..dfa2ecae38f0 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Text-Diff
diff --git a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
index 18db153b2575..cc208ed87827 100644
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Most commonly needed test functions and features"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild
index 948e254270c1..db6243d1372f 100644
--- a/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild
+++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="fork test"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
index 85168c33e088..4d23df000946 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perform diffs on files and record sets"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
index 0c7a72b16631..5eadd05a13d4 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Minimal try/catch with proper localization of $@"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.1.0.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.1.0.ebuild
index c6ff1f072f7a..d12c80a403c4 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.1.0.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit php-pear-r1
 
-KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86"
 
 DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
 LICENSE="LGPL-2.1"
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index 62e5f3873c8b..0a041f23d2b0 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -1 +1,2 @@
 DIST Net_SMTP-1.6.2.tgz 13077 SHA256 98d3ab28e99de2a8b1c39650c3ac107ac1caf09639b1d2018adf058dd9864785 SHA512 ffb9fd28e2ef66f26197423dd9249f3a7b6d2ad2fabe5719eb890cabaa7a20f75a8cd90bb829fd301cee22026805c96824ea03acb3e931ba9edf8d1ef320f3e3 WHIRLPOOL 909eba8a96b465aa81cba186b33dc1bafbb2340d86d6fac16d5cebe5f4297128b6ec5b837c6dbae554b6fbcbf26d751e591523137c5c7ee8907abcd23cbef0e0
+DIST Net_SMTP-1.7.1.tgz 14911 SHA256 5539c0a7aa0e7a6d681010f0eece975d661b1fed577761fd6ed2fee8c9a3c834 SHA512 8779929b18885a353311ef3623baeb0bd092bc28772e65de1744ffd285bfe2fc58d15f2ea6cc9cceb7c2031558d57ed350ed756441a50e0e4566f0a45848b6df WHIRLPOOL 349b46306d541c3bb29484940e7d4a312cb6848a0d579ead1106ce5729a4576e7729fd85c0363bebcaccd645c74d33c51202e166c2d2e2ef1bbffd569587bec6
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.1.ebuild
new file mode 100644
index 000000000000..43e1dac1c9aa
--- /dev/null
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit php-pear-r1
+
+DESCRIPTION="An implementation of the SMTP protocol"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="sasl"
+
+RDEPEND="dev-php/PEAR-Net_Socket
+	sasl? ( dev-php/PEAR-Auth_SASL )"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f882b65b9cf6..84716cf15ae3 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,4 +1,3 @@
-DIST 1.1.11.tar.gz 1975224 SHA256 b4e6edc12177dd4f720259aa7027bab00fb9db2029e40e77e67c552ef9f41132 SHA512 b0b10299d93314de582cfd21511987fe210df1618c49f6c706c4341a3a635a85cd48d8848a69f83391a227ab5dc3881509a02b4cc47b1e27d18cf353d4de850b WHIRLPOOL 21e662fe7f713a98e5e16225e3860585f0abb8e4a47b5f0ae52262a929a32ce563e1108c80602c9c2136180957c1b8bb4b89d8b9fc84415c155212d326f08b90
 DIST botocore-1.2.10.tar.gz 2202147 SHA256 8541895aa2abe2183fa15efe33794db7428fec3302e0c9bf1db13fa1668e2b66 SHA512 5395776f50c5302d2fa75af702ced17da66a4c0435d62aed907f1ceaa93d38acc2d91a250d2153d852239a08d9f7f0bf361523cc89168a6cb81ef6f8a6ec5124 WHIRLPOOL aa4ff7a2aa1a900642782783b85479943bcce85c7df0c056d989d329c0693424110859a1d9d358e0cc5af94be174c96786c2f339e78934c114011606dfce11ec
 DIST botocore-1.3.14.tar.gz 2289202 SHA256 44904496f26370f47469327e5df10e439aa07aaf1c0516c7c67352337eeeb729 SHA512 7cf1a342271b02842c5d989fa4ac2bb02074f8ff18dda70c751857f44b83e2ce02c904f0484a05f274bcb9459bf580e0456b72554e87509b2f2529170a239362 WHIRLPOOL efa0d700bdd7e9803be63fc3a54fffb4234356769b1dea69bf93c974deb9a3a3438d88de004dce6a0c83390042fb8f2b822d9204f6727eceb5aee657c22c6a98
-DIST botocore-1.3.2.tar.gz 2243332 SHA256 af8176c95244bd9195afb4cf2a2c21a605e884cf6886889c6d983d2adda844ad SHA512 e68288c0f9aae3e30814df3a5562e503d6affc238d74f2a2c8c7e1796f3a1d49bf3408befd9aeb8753d81944118cff7af61ba7db57881f51ca07378fd0d1ec4d WHIRLPOOL adfdef5696e2f3d95626f2b474fe616db5a3874bbfdacb33ed69260dc66c9c62c86016fe9f102272ef012d1b0ec64a1ebe9f0502830c6648be959cf1b8fd7739
+DIST botocore-1.3.20.tar.gz 2326244 SHA256 9760d883611110a05f5f8346c7b2198aef87be9117d4cbe1e4ee6608a560c4a2 SHA512 bd8d80598631610da4f05c8cc735affef31c726dc30512e358950e967efefbe63455bc63dccbb180f059a3f9da6c0004edfafc9bf99198732708c1ef141f0b06 WHIRLPOOL 18ba18fa6d62b10d7547f58bf6e8d26cab8564f4e8a229dd6f939db6b4f4d05edda4a239811067443d14edcfe2b293acdb449fc809f551f99b4ff37e4fb70fbd
diff --git a/dev-python/botocore/botocore-1.1.11.ebuild b/dev-python/botocore/botocore-1.1.11.ebuild
deleted file mode 100644
index 530b89a26ded..000000000000
--- a/dev-python/botocore/botocore-1.1.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.3.2.ebuild b/dev-python/botocore/botocore-1.3.20.ebuild
index 74e695890019..44e0a6ae37a9 100644
--- a/dev-python/botocore/botocore-1.3.2.ebuild
+++ b/dev-python/botocore/botocore-1.3.20.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$
 
@@ -33,7 +33,7 @@ DEPEND="
 	)
 	test? (
 		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 998118b0b5f3..463c4fc33f40 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,5 +1,4 @@
-DIST bpython-0.13.1.tar.gz 156558 SHA256 ee208a60a54f902a8c827f4a80fda8a6235790d59cc1fc089943df50936accae SHA512 cb3f1e8d8df5eb9978956b3503ef98b1c39e80704792281be7e560ec0d648aefa6d979ab45a642ec369fc252e7fde399013aa1a4154ceb73465bc3d95bea4b19 WHIRLPOOL a5d00b92507d1970de95f20ee54723774432687b1f11637f3aa75f9e8979e93015034f37253bd947100436f8400cdbe2ba523b6517a7ba265950b3f20dc6f9db
 DIST bpython-0.13.2.tar.gz 158551 SHA256 a1870a78e44ed6ef54aa906c58234cb0d12011f2e9a49dc29bd5d9423abfbde2 SHA512 6bf74c9618bf92fc6ca23c9020b17219c64b16f159773624b67f87875c962857bde2dd4b03da621da7c8d50622739f95a880638c7c536f5f0dbf510c71f5a874 WHIRLPOOL 71da7518100bd73868ab53e1d13cb8831b0f6629713b993729948f38df52262537b8605f9304ff0edeca5e4f4d3435677c61e84b2d6fc54b2d66df74e756318c
-DIST bpython-0.14.1.tar.gz 184850 SHA256 d96224d55ffb99ef9d2565e9b18202080b3659408fcce2594c9ec7bde65d8eb1 SHA512 6583d74cae29244ceefcbb2aaf24e789dafd63f9295e3e848f9e298b958d4a344c606051a9efd7f5a728d3ad1b9e58d011931d14f7e60e7c1fbd8b38a2dd1b09 WHIRLPOOL f52e7660054af1547452d777801a79e028378ed1d2f3fdfd3a36e9e5a9154d8389a5eb37e108abef06eb178340be234dacc2b87567bcc37797d3f519b4ea6644
 DIST bpython-0.14.2.tar.gz 184808 SHA256 d1f03c9b64a67219ef41aec258c95f192ade5fd187d48fe61b15c1f1d707e302 SHA512 aa6fb8a6fe08746c31783308423400bf2482c6401fc03a1cf1e95592b83946b49eb8df29ac274d0711e01e7b2dcad37c00a609b3b600c31774563d0638d67159 WHIRLPOOL fe6847da5bb0b5b72f9230d175dbe0812a010281bf6a022f87196f71426a37d116a3bf9292cdd20fcd465e56d9b7c3d975028d2bb3a07afacc5c87f3b4b3d0f6
 DIST bpython-0.14.tar.gz 184430 SHA256 f7c9fc80fc5a4eb6a345a67815e31957c0c65c1bbdfc68cf99267cdc81a3d35b SHA512 1c43af30902ac01385a4f9d0af1f7531f190dea9ee0d43725d5a23d881874184beca1df9fc8f94f21110d99ca07a851861c56976199e9306515e2b00ca07f1f7 WHIRLPOOL 21dc44b48a0fb31d0c125fc203f90fe7750e81599353a51c215672ed82218fc3b4f544cdb530d6447d099e4eaa5983ad52b8f48e1e83bcf4799dad190af797eb
+DIST bpython-0.15.tar.gz 198852 SHA256 3f4f7a32416371da2ee0774726875ce63d3f9fed8b58e5a9ad1580b33fd3cef7 SHA512 421a4c8cd7885b0cc73c38ca89bfdbe6535fc4f4575c42195b1b6a9ccdb68e8c3491ebefd7439241f322c3e4ae0a37679253ae8f63b41fc2cfc7fc2ab77b8867 WHIRLPOOL e6a83335d7ea2d099098fb3014aa212a14e71786c9d7e323cf0bba7223b98b9b4cffbeb214de53d9e00b03088304d41fedc37334266fa7e44ae4e905132c72c8
diff --git a/dev-python/bpython/bpython-0.13.1.ebuild b/dev-python/bpython/bpython-0.13.1.ebuild
deleted file mode 100644
index 4e37da26f258..000000000000
--- a/dev-python/bpython/bpython-0.13.1.ebuild
+++ /dev/null
@@ -1,67 +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="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ https://pypi.python.org/pypi/bpython"
-SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk test"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	gtk? ( dev-python/pygobject:2[$(python_gen_usedep python2_7)]
-		dev-python/pygtk[$(python_gen_usedep python2_7)] )
-	dev-python/urwid[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS  CHANGELOG  TODO sample-config sample.theme light.theme )
-
-PATCHES=( "${FILESDIR}"/${PN}-desktop.patch
-		"${FILESDIR}"/${PN}-0.13-test_repl.patch )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use gtk; then
-		rm -f "${D}"usr/bin/bpython-gtk*
-		# delete_unneeded_modules() {
-		rm -f "${D}$(python_get_sitedir)/bpython/gtk_.py"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
-	sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
-
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bpython/bpython-0.14.1.ebuild b/dev-python/bpython/bpython-0.15.ebuild
index 6d90b5849035..4ac804f335a1 100644
--- a/dev-python/bpython/bpython-0.14.1.ebuild
+++ b/dev-python/bpython/bpython-0.15.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,11 +11,8 @@ PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ https://pypi.python.org/pypi/bpython"
-SRC_URI="
-	http://www.bpython-interpreter.org/releases/${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/bpython/files/bpython-0.13-test_repl.patch b/dev-python/bpython/files/bpython-0.13-test_repl.patch
deleted file mode 100644
index b71cfbea3440..000000000000
--- a/dev-python/bpython/files/bpython-0.13-test_repl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bitbucket.org/thomasballinger/bpython-for-clean-patch/commits/94c4664c1303
-# HG changeset patch
-# User Thomas Ballinger <thomasballinger@gmail.com>
-# Date 1404088731 14400
-# Branch 0.13-bugfix
-# Node ID 94c4664c130303b1ae53629d6ebcff04f5d5d7ae
-# Parent  106c49981f5e2db325d543d24c063f9c38013023
-simplest possible fix for test that changes in py3.3
-
-diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
---- a/bpython/test/test_repl.py
-+++ b/bpython/test/test_repl.py
-@@ -1,4 +1,5 @@
- import os
-+import sys
- import unittest
- from itertools import islice
- from mock import Mock
-@@ -280,8 +281,12 @@
- 
-         self.assertTrue(self.repl.complete())
-         self.assertTrue(hasattr(self.repl.completer,'matches'))
--        self.assertEqual(self.repl.completer.matches,
--            ['UnboundLocalError(', '__doc__'])
-+        if sys.version_info[0] == 3 and sys.version_info[1] >= 3:
-+            self.assertEqual(self.repl.completer.matches,
-+                ['ChildProcessError(', 'UnboundLocalError(', '__doc__'])
-+        else:
-+            self.assertEqual(self.repl.completer.matches,
-+                ['UnboundLocalError(', '__doc__'])
- 
-     # 2. Attribute tests
-     def test_simple_attribute_complete(self):
-
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
index 9b9995d288cf..894f3017ac71 100644
--- a/dev-python/bsddb3/bsddb3-6.1.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
index 7e69d6eba25c..fb65bb4cf6dd 100644
--- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.7.2.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=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorlog/colorlog-2.6.0.ebuild b/dev-python/colorlog/colorlog-2.6.0.ebuild
index a586d01e0064..1e8ec03b27ae 100644
--- a/dev-python/colorlog/colorlog-2.6.0.ebuild
+++ b/dev-python/colorlog/colorlog-2.6.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 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
+IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -29,6 +29,5 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( doc/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/django-otp-yubikey/Manifest b/dev-python/django-otp-yubikey/Manifest
index 13ffc23bf1eb..29697fe88c71 100644
--- a/dev-python/django-otp-yubikey/Manifest
+++ b/dev-python/django-otp-yubikey/Manifest
@@ -1,2 +1,2 @@
 DIST django-otp-yubikey-0.2.0.tar.gz 11264 SHA256 72a62d0a0cec9ccf1a1a029b04b6b620f30ec501c0115a52ef6472a6817ba808 SHA512 f0b18fb262caa76a25af0a063c85c07b41f7d211dacd1db2dc6cd55995bc505a1e70535b70a95cba722685a3b34c8a304e9b829b9c3f27caae67921f86f7ffde WHIRLPOOL ccd74c242715cd54436ac451b2d69b8a4a75291ac4f2d05ec3c4ead0dba61329ea720149e369799e3772da97ecc4a70139c0ffb7bf658213072c44b5a2cdc3c9
-DIST django-otp-yubikey-0.3.2.tar.gz 14099 SHA256 602ed013924818a0aead4a6cee0751b6113b22846126e5635f7bff5015ffd053 SHA512 8961b2de297e4759e1a5c3920ea8b4168d5a14e83b7ef6866598d9f22ac3157886298d424cba8c8418601227e5cb8d8fb4237cfbd66684077e25e1cd968fc589 WHIRLPOOL e50ff65eaeaa7848a514737604a550843f5e855c26d59eb33d69524827ecd8a013afd05aa4e4e382caa10aa87c89577925892787da31a9be70ebabd83853b2b1
+DIST django-otp-yubikey-0.3.3.tar.gz 14233 SHA256 0e9f748abf2e380163f33b28de2a1a1a5bb06b8f0c6e91fabdea70d49f1cf58a SHA512 80c9ffb42a7109a04eca4fabca33294b3a65abeb12f408cb6d7c6c06644896629df43d32833d514e0a60ddd6352af073fb5b2f1174a07b370214a76ccc093c3e WHIRLPOOL 5954620768db812845ec017ecce880c9aeb84e0fda15d4cdf4e7ef45555fd06c4d29f21049c8abd1a0a588b219dfabe44fa9562c27b9e7e4a9da104627edef77
diff --git a/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.2.ebuild b/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.3.ebuild
index f72c43c05040..ad45a26c5a14 100644
--- a/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.2.ebuild
+++ b/dev-python/django-otp-yubikey/django-otp-yubikey-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$
 
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 762813281b03..800f7b12c24e 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,2 +1,2 @@
 DIST django-otp-0.2.7.tar.gz 76879 SHA256 dfc305aa894da2b7111c8846d90254b0d9099f415e14165f6e784f5ceddd5f3f SHA512 b48c6dd505ed06b4028a1d27213ea759a1a54ca5f4e5c8dc2aad826535a80295fcdde3a1da455256927d26906e53ee40c47a0ab89de5c6331c2f3567e43fdae7 WHIRLPOOL eb819e389d924953537f0f9db2dff56631b07ea50f898abd398f873dad0144255e14984f6f5aa2ab0d0bd296163c995c7837ab6fafefab87646189047b839f52
-DIST django-otp-0.3.1.tar.gz 38800 SHA256 2aa9f24d655ca0c2583b7fc08c603c2861f337155e35fcc5aae9946e6985db45 SHA512 6eb78da109609ab843d97c170615a2273f32fa02cd9ca874f8e059c80736d98015477c1c15e8db2fba59a449b44c471f067e3ddb87776378e908c04e3a8a82db WHIRLPOOL fe27c2fbdd89ff279694d4b2baa0cd11354c104baccbad8282036ddd476da5b3cadb331d372c7114bcc77f885c606f875039e27b72f1d271fa1df7387e794d2a
+DIST django-otp-0.3.4.tar.gz 39992 SHA256 5e002e6f63211f1d2babb525f3ba7ef07851239671c48c439ba4800099cb5a2e SHA512 62b6683050a9dbd0bcfc9a63bd965f19e5d088c3e53c5e45067f8a785aa7b2a7b540d0331742bf8b979ad95d308f944bfef250989d1f782849a71bbc79a7d53c WHIRLPOOL cab0e765007e68caaf79272452d9de74fbc11ccd84f436e506e3180e5ce20bec52ada1b7a75deab3f586bdda76207bc5ebf376288094568bdc0dcaae0389f10e
diff --git a/dev-python/django-otp/django-otp-0.3.1.ebuild b/dev-python/django-otp/django-otp-0.3.4.ebuild
index 407eec6f7e92..ffa3458685e5 100644
--- a/dev-python/django-otp/django-otp-0.3.1.ebuild
+++ b/dev-python/django-otp/django-otp-0.3.4.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 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit distutils-r1
 
-DESCRIPTION="A pluggable framework for adding two-factor authentication to Django using one-time passwords"
+DESCRIPTION="Framework for adding two-factor authentication to Django using one-time passwords"
 HOMEPAGE="https://bitbucket.org/psagers/django-otp"
 SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/django-phonenumber-field/Manifest b/dev-python/django-phonenumber-field/Manifest
new file mode 100644
index 000000000000..aa65efae5291
--- /dev/null
+++ b/dev-python/django-phonenumber-field/Manifest
@@ -0,0 +1,2 @@
+DIST django-phonenumber-field-0.7.2.tar.gz 6208 SHA256 f3b23af290d0f800945c44e0737bd32f3ee38f63e7ad7076450778fe682a52fe SHA512 bdb48ac1fa22c959409ba37b28786fbb46220628bf88265dd3c13ab2c676816d0dd1ed9195ce614a8184937347c3c4760fbdd1f57e235758790881af9a44f504 WHIRLPOOL b83b276d18b4014657b8d0705f00358049ec242ad4552d7f679e8cca9d650f49bde0a2d11b91cd42b09f75783d74d480ccc18e70e8acf50b4fa2be514c97b2a2
+DIST django-phonenumber-field-1.0.0.tar.gz 7871 SHA256 36abe11167ff24abd0d575bb48b2307b10499f53a658e63f695c0a1187119fe6 SHA512 aab5efd10f2872a60f4115fe160490b7c6a668e9ee63f34bc12647c068c9f97894a9d00de4f988c0b5e07ed1c0e408a663669c0c7a7e05a543d21589296e1377 WHIRLPOOL 15e8d066c9438b3032aa1e889071dea5b7e3c294cb91f9b36a513b6e287a74012e8d9c33cb89c5171ec2b66b078dca7a14c81cd34500d99cf36d180e144b2dc9
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild
new file mode 100644
index 000000000000..72470d88b1e5
--- /dev/null
+++ b/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.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 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
+HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
+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}]
+		dev-python/Babel[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
+		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-1.0.0.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-1.0.0.ebuild
new file mode 100644
index 000000000000..251d5c6af8b8
--- /dev/null
+++ b/dev-python/django-phonenumber-field/django-phonenumber-field-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# 1.0.0 would support 3.5 and pypy too
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
+HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
+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}]
+		dev-python/Babel[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
+		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/metadata.xml b/dev-python/django-phonenumber-field/metadata.xml
new file mode 100644
index 000000000000..b16dfd9305ea
--- /dev/null
+++ b/dev-python/django-phonenumber-field/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>
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">stefanfoulis/django-phonenumber-field</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-two-factor-auth/Manifest b/dev-python/django-two-factor-auth/Manifest
index 39fa65ef2558..38d6a3c193ff 100644
--- a/dev-python/django-two-factor-auth/Manifest
+++ b/dev-python/django-two-factor-auth/Manifest
@@ -1,2 +1,2 @@
-DIST django-two-factor-auth-1.1.1.tar.gz 101960 SHA256 19cf066f7a4c76147d3ad5e5e46cf078772064ecde83acf9ece93670ec92d9cf SHA512 f0ff3deeceb00b2b28d6237e1d4e4dbc2574c872b564abb491b77130b56aa7a705432ac93bf2a9ae9f03e780c58c409584d624f41bce690afd910edbc8bb5eae WHIRLPOOL 7f20d4060b549792a7e5e36857ded765e3d06df403163d38dfcb67a93ee0c62a10fd7bad5b1055c28693ae05e5c93bfe137b7095ad0ab2ec26b20c1627d4b8d6
 DIST django-two-factor-auth-1.2.1.tar.gz 102165 SHA256 e98d6bea7f18d5667a2681e524739f60d8680f747e9aeb094c5175f7dcc540a6 SHA512 c7947318929a91096e329e21db81c798f6522050d45203dd2cdeb0708f03d06ab6c650305546cd5e53080cdc77f43c6bcedbc77ad7eb1c88ffa49da5957f40ff WHIRLPOOL 6393b76fdbd3020e73fd26b564793fe8944d57a1728b15253f8efd7d19253cb1f7a369fa94bf2b500ba618919a6914f766b25d852501db3defaed77a0a3b0a9a
+DIST django-two-factor-auth-1.3.0.tar.gz 98955 SHA256 874daf7b5aa0f9f9eb57a8a08a8730727940c38f8603caae77ade314e1c8cde8 SHA512 5876e82897b7b86663f12701652d266c20a9d4ea16da8722e96050ecf3a3997fb0bf3e08cbcc1ae12763f68e52d66d2749343f8b7757d4286da14e8ceb98c85b WHIRLPOOL 66282472cd3bce5359f724b0fa64a2be2f9ab9635db7862a023e4f1b58d2dd2a8f3e9bb5fa5d06d686ff7d794b010d2381541391c13c4879c389fb84f4565aba
diff --git a/dev-python/django-two-factor-auth/django-two-factor-auth-1.1.1.ebuild b/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild
index c2d665df72c4..c709dcacdbf1 100644
--- a/dev-python/django-two-factor-auth/django-two-factor-auth-1.1.1.ebuild
+++ b/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild
@@ -1,9 +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
 
+# would support 3_5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit eutils distutils-r1
@@ -18,10 +19,13 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="test yubikey"
 
-CDEPEND=">=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/django-otp-0.2.0[${PYTHON_USEDEP}]
+CDEPEND=">=dev-python/django-1.8[${PYTHON_USEDEP}]
+		>=dev-python/django-otp-0.3.3[${PYTHON_USEDEP}]
 		dev-python/qrcode[${PYTHON_USEDEP}]
 		dev-python/twilio[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-7.0.9[${PYTHON_USEDEP}]
+		=dev-python/django-phonenumber-field-0.7.2[${PYTHON_USEDEP}]
+		dev-python/django-formtools[${PYTHON_USEDEP}]
 		yubikey? ( dev-python/django-otp-yubikey[${PYTHON_USEDEP}] )
 		"
 
@@ -32,11 +36,6 @@ DEPEND="test? (
 			${CDEPEND}
 		)"
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i "/'qrcode/s/^/#/" setup.py || die
-}
-
 python_test() {
 	emake test
 }
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index dce6e80c93e8..15077b0a1920 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,4 +1,2 @@
 DIST google-apitools-0.4.11.tar.gz 141425 SHA256 60dae36e70c87909cb8942ebf401bbec50583461c9aa40d24564bc4c3832a550 SHA512 3ee58add383da4ed0dec2e646b13e840c3bb9d4a7b1adf68293e8e22b3db1f7689d19282236995e9374aa160f0569a2b533e737e3ef4f1f4b60d00ff4d4d1bb9 WHIRLPOOL c96200b26eed1ba92411f295a0f34dda995888687c136d7f0744fa09c5ba9bc6d93f168b4e12d905278128f8a28ecf173f968ee69c6636a580439ec3b5a3a223
 DIST google-apitools-0.4.12.tar.gz 198590 SHA256 dd69b791b9421d3a9dd782f5a811555dd60ba198a71581186114c3779e6e31d5 SHA512 6cdb55b94ebf9fcd26e0d4b8659ed44809b5fbd9bbb2830f3352219fb7231b79cf2f8668497a85bc8ea29dbf8b110a081b34c4783f71beb2cd707838e1e107dc WHIRLPOOL 273cb43c7c42d3d99fd9f52484d30583723edcc4d511dfe9512dbf2197ada51a483141b66ac3e1349dcb8fdbde3de2a8c036648abc3e48f3f5dd49b54ca6f949
-DIST google-apitools-0.4.6.tar.gz 122851 SHA256 1ff89a3b968e83b7fed87e43071decbffa6cfcf8a9adec4342708162b3018d54 SHA512 9b672776b72fba2edd30f2a9cf098dff352dda78075643d55b10187a0ee12e689982c920f76fe4d745ccab829e3ff1fd9818c306ffba20be93020748750e85b4 WHIRLPOOL abd70f06208e1d8b79cfa8b2cf5f01c40f0c520fbd744aa1bb400efd953fc151c0751045b29fdb9ab1610f995d75d640294444fd293a3e6f31fdf3255c0d4dfc
-DIST google-apitools-0.4.8.tar.gz 128587 SHA256 8d4009c5096cc1a8d9be73399bea678035d12c2e67e0d14dd9a9ceded8d771f7 SHA512 28570a050cb7e6c839e39f24908734696a72e05cdb6d84376faf637affd8bf116785411402eddccc1cfa692f753acd82c49ad04ccdce1e4aec66fe2b1b901320 WHIRLPOOL ec0cf908fe10e944199f4b677fd26f2099eb085261f7e2f2ff8441ab77f9cc2fe0fede9dd765fba8e47394f64e402e35fc0ad087af473992b35db665d67bc296
diff --git a/dev-python/google-apitools/google-apitools-0.4.11.ebuild b/dev-python/google-apitools/google-apitools-0.4.11.ebuild
index 670ec7c87c26..4a978f90e955 100644
--- a/dev-python/google-apitools/google-apitools-0.4.11.ebuild
+++ b/dev-python/google-apitools/google-apitools-0.4.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="utilities to make it easier to build client-side tools, especially ones that use Google APIs"
+DESCRIPTION="Python library to manipulate Google APIs"
 HOMEPAGE="https://github.com/google/apitools"
 SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/google-apitools/google-apitools-0.4.12.ebuild b/dev-python/google-apitools/google-apitools-0.4.12.ebuild
index bdb38f814c1b..0c28107dc52f 100644
--- a/dev-python/google-apitools/google-apitools-0.4.12.ebuild
+++ b/dev-python/google-apitools/google-apitools-0.4.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="utilities to make it easier to build client-side tools, especially ones that use Google APIs"
+DESCRIPTION="Python library to manipulate Google APIs"
 HOMEPAGE="https://github.com/google/apitools"
 SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch b/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch
new file mode 100644
index 000000000000..fecfab9a4fb4
--- /dev/null
+++ b/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch
@@ -0,0 +1,117 @@
+From 46046c0f7125911ff8205f09a7574573bb953105 Mon Sep 17 00:00:00 2001
+From: Geoffrey Sneddon <geoffers@gmail.com>
+Date: Mon, 23 Nov 2015 15:17:07 +0000
+Subject: [PATCH 1/3] Make lxml tree-builder coerce comments to work with lxml
+ 3.5.
+
+---
+ html5lib/ihatexml.py                | 2 ++
+ html5lib/treebuilders/etree_lxml.py | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
+index 0fc7930..b5b2e98 100644
+--- a/html5lib/ihatexml.py
++++ b/html5lib/ihatexml.py
+@@ -225,6 +225,8 @@ def coerceComment(self, data):
+             while "--" in data:
+                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+                 data = data.replace("--", "- -")
++            if data.endswith("-"):
++                data += " "
+         return data
+ 
+     def coerceCharacters(self, data):
+diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
+index 35d08ef..17007e3 100644
+--- a/html5lib/treebuilders/etree_lxml.py
++++ b/html5lib/treebuilders/etree_lxml.py
+@@ -189,7 +189,7 @@ class TreeBuilder(_base.TreeBuilder):
+ 
+     def __init__(self, namespaceHTMLElements, fullTree=False):
+         builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
+-        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter()
++        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+         self.namespaceHTMLElements = namespaceHTMLElements
+ 
+         class Attributes(dict):
+
+From 1c22e1ce93dd4acc81a66cfa03cf9720fbd741c7 Mon Sep 17 00:00:00 2001
+From: Geoffrey Sneddon <geoffers@gmail.com>
+Date: Mon, 23 Nov 2015 15:35:21 +0000
+Subject: [PATCH 2/3] fixup! Make lxml tree-builder coerce comments to work
+ with lxml 3.5.
+
+---
+ html5lib/ihatexml.py                | 1 +
+ html5lib/treebuilders/etree_lxml.py | 7 ++++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
+index b5b2e98..5a81a12 100644
+--- a/html5lib/ihatexml.py
++++ b/html5lib/ihatexml.py
+@@ -226,6 +226,7 @@ def coerceComment(self, data):
+                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+                 data = data.replace("--", "- -")
+             if data.endswith("-"):
++                warnings.warn("Comments cannot contain end in a dash", DataLossWarning)
+                 data += " "
+         return data
+ 
+diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
+index 17007e3..c6c981f 100644
+--- a/html5lib/treebuilders/etree_lxml.py
++++ b/html5lib/treebuilders/etree_lxml.py
+@@ -54,7 +54,7 @@ def _getChildNodes(self):
+ def testSerializer(element):
+     rv = []
+     finalText = None
+-    infosetFilter = ihatexml.InfosetFilter()
++    infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+ 
+     def serializeElement(element, indent=0):
+         if not hasattr(element, "tag"):
+@@ -257,7 +257,7 @@ def _getData(self):
+             data = property(_getData, _setData)
+ 
+         self.elementClass = Element
+-        self.commentClass = builder.Comment
++        self.commentClass = Comment
+         # self.fragmentClass = builder.DocumentFragment
+         _base.TreeBuilder.__init__(self, namespaceHTMLElements)
+ 
+@@ -344,7 +344,8 @@ def insertRoot(self, token):
+ 
+         # Append the initial comments:
+         for comment_token in self.initial_comments:
+-            root.addprevious(etree.Comment(comment_token["data"]))
++            comment = self.commentClass(comment_token["data"])
++            root.addprevious(comment._element)
+ 
+         # Create the root document and add the ElementTree to it
+         self.document = self.documentClass()
+
+From 235a6d7ac7e0a3e2b431766e051094c2d3110ba3 Mon Sep 17 00:00:00 2001
+From: Geoffrey Sneddon <geoffers@gmail.com>
+Date: Mon, 23 Nov 2015 15:42:12 +0000
+Subject: [PATCH 3/3] fixup! Make lxml tree-builder coerce comments to work
+ with lxml 3.5.
+
+---
+ html5lib/ihatexml.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
+index 5a81a12..5da5d93 100644
+--- a/html5lib/ihatexml.py
++++ b/html5lib/ihatexml.py
+@@ -226,7 +226,7 @@ def coerceComment(self, data):
+                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+                 data = data.replace("--", "- -")
+             if data.endswith("-"):
+-                warnings.warn("Comments cannot contain end in a dash", DataLossWarning)
++                warnings.warn("Comments cannot end in a dash", DataLossWarning)
+                 data += " "
+         return data
+ 
diff --git a/dev-python/html5lib/html5lib-0.9999999-r1.ebuild b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
new file mode 100644
index 000000000000..f55b65fe2c79
--- /dev/null
+++ b/dev-python/html5lib/html5lib-0.9999999-r1.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=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-lxml-3.5.0-backport.patch
+)
+
+python_test() {
+	nosetests --verbosity=3 || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/httreplay/Manifest b/dev-python/httreplay/Manifest
new file mode 100644
index 000000000000..b7712bc2c5b4
--- /dev/null
+++ b/dev-python/httreplay/Manifest
@@ -0,0 +1 @@
+DIST httreplay-0.2.0.tar.gz 8493 SHA256 dce205393b19f9a6e052ec84104bdbe4f10b70f7db7a40b09a2b3c904760b90c SHA512 0a035425241d34aeaed2ec219e7fdb7894ba09b711ccd60ca909f4f56467505bc39a8e77999a9196280883ff818165f9e4fb581e93df5d85a1dd30a0f243ea6b WHIRLPOOL 2a5260f679cbc502d07f64355e1315d39aee4ce9f6d0bd48f209cdd88942f7ba63d7b876a925e50341725e1743816e51a20c52974757b5d590e191556cb96eb5
diff --git a/dev-python/httreplay/httreplay-0.2.0.ebuild b/dev-python/httreplay/httreplay-0.2.0.ebuild
new file mode 100644
index 000000000000..561b07622de8
--- /dev/null
+++ b/dev-python/httreplay/httreplay-0.2.0.ebuild
@@ -0,0 +1,18 @@
+# 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="A HTTP replay library for testing."
+HOMEPAGE="http://github.com/agriffis/httreplay http://pypi.python.org/pypi/httreplay"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/httreplay/metadata.xml b/dev-python/httreplay/metadata.xml
new file mode 100644
index 000000000000..c1d3f6d580ad
--- /dev/null
+++ b/dev-python/httreplay/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">httreplay</remote-id>
+    <maintainer status="unknown">
+      <email>davepeck+httreplay@gmail.com</email>
+      <name>Aron Griffis, Dave Peck</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index ad86b24db359..6143fe9a4541 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -5,3 +5,4 @@ DIST keyring-3.1.zip 84216 SHA256 4aa49fa03e6d7b79e1490278c7610f6ff224f58ea8dd90
 DIST keyring-3.3.zip 86419 SHA256 b42e0d335102cb2cace64289c86faa6686b6addad803b032bf564046e24d1936 SHA512 32845546328969ddd2179e83bfeacccf5ef60e20919258f4bf6e938cffa6dbfa66b9b0cd64d26d8df636c41d387e6b87aaa1645fd6d86aecb3de937f3acccc8c WHIRLPOOL fe6a0f4209e1df5fa0f4d681cdc6f14e83c658604690e9f27e88f4eccb695aea0c7da0219704ab0f024deaaabc38d6666410f04f9ccbd1ce910d797d3bcf1b29
 DIST keyring-3.7.zip 89249 SHA256 e187358e6a9b8e63cc2e223f6f9d4c40c972c0076f4aa0d65b8c9eb75edbea02 SHA512 7343d40566484b33e3f265d874d75fcf502dbc0abfd653db65536ca4d475fc5596ba23a6472467b88b589fca740f62860a39d18ad7a285696b4cc2c79abe2729 WHIRLPOOL 79967660e4db75f4a89ebc462ee4cb73b3b261bdfc9666979f7a08cfcac6a04b2cbe975b0467155b8b159c630bdf938afcc5d9a3ab25928abfaf54cf6b233844
 DIST keyring-4.0.zip 83738 SHA256 ea93c3cd9666c648263df4daadc5f34aeb27415dbf8e4d76579a8a737f1741cf SHA512 e16fe24e9dfa897ecf05c5b269fd490abff654a885c8cf928d133943648fef436555832e3a364698fe7615be609e8b13808ebe6a758612c12d9067dbe6286bd1 WHIRLPOOL 4ff17622cb9d0bbb3af44947cab2436931f5738c3d4e9ddab36923b2c005c66f27f795acf0614d8d37a6cc148bb74124d9f2ae24a9727ea9a4e71db120a56ab8
+DIST keyring-7.3.tar.gz 53672 SHA256 b42cd886c025fb86c09963d6fdb4010b508a5d6dbe278d6c2d8e7cef533b566d SHA512 8a2f3c20969f994437c90c648cb164b99ad207117124dbeaa837a3b5932b521b7b34ea9692250d6a07452bcbc5dae6a57e636dea6c56c0583a3416d2f3aa8b00 WHIRLPOOL a201925abe457422f002c6e910723f20ab328c44e876c6042a368e35f2ed62534af6f2e547ebd9f318333f000c02e6462c388e0ac2ac8f04ad79ac810b714ed0
diff --git a/dev-python/keyring/keyring-7.3.ebuild b/dev-python/keyring/keyring-7.3.ebuild
new file mode 100644
index 000000000000..19ed821bd131
--- /dev/null
+++ b/dev-python/keyring/keyring-7.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/gdata[$(python_gen_usedep 'python2*')]
+		dev-python/keyczar[$(python_gen_usedep 'python2*')]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycrypto[$(python_gen_usedep 'python2*' 'python3*')]
+		)"
+RDEPEND=""
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index 28d922b3ea6a..e6265b27b1f3 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.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$
 
@@ -65,6 +65,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.3.4
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexrecommended
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
index a98751d2621b..71afc139a5d8 100644
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.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$
 
@@ -73,6 +73,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/mock[${PY2_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.3.4
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
diff --git a/dev-python/matplotlib/matplotlib-1.5.1.ebuild b/dev-python/matplotlib/matplotlib-1.5.1.ebuild
index 410effc18030..904233abff9a 100644
--- a/dev-python/matplotlib/matplotlib-1.5.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.1.ebuild
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/mock[${PY2_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.3.4
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index 579d0c58c6c9..a23721d5302a 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/mock[${PY2_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.3.4
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
diff --git a/dev-python/meteor-ejson/Manifest b/dev-python/meteor-ejson/Manifest
new file mode 100644
index 000000000000..5c3619a49575
--- /dev/null
+++ b/dev-python/meteor-ejson/Manifest
@@ -0,0 +1 @@
+DIST meteor-ejson-1.1.0.tar.gz 2292 SHA256 17c10d00ae4ed4ab8daf3b1e18f1bbe46803058cb6ff81d9d5a73ae6b565224a SHA512 eb211d262f0006f3229296b71320f68b59d8a7e618e65baa8e613f874a0e6ac9cfe45e30fc73ba57c42129204c5f27a32c4b8b579527fcefd601fa1dc2844da3 WHIRLPOOL 7338c6587ed7f43383fb53ee0d63020a545138e51fd47b4eaaa44ac4ceb771628cad0480060a1cee4833e06814a0e2acefd88bf5fe28f288d7ab32eca5ea2017
diff --git a/dev-python/meteor-ejson/metadata.xml b/dev-python/meteor-ejson/metadata.xml
new file mode 100644
index 000000000000..cdc8aea2111d
--- /dev/null
+++ b/dev-python/meteor-ejson/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">meteor-ejson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
new file mode 100644
index 000000000000..fbe66fb87862
--- /dev/null
+++ b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Encoder and Decoder for Extended JSON (EJSON) as used in Meteor and DDP"
+HOMEPAGE="https://pypi.python.org/pypi/meteor-ejson https://github.com/lyschoening/meteor-ejson-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pbr/pbr-1.8.1-r1.ebuild b/dev-python/pbr/pbr-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..db2b0efbf085
--- /dev/null
+++ b/dev-python/pbr/pbr-1.8.1-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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+PDEPEND=""
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	# Rm tests that rely upon the package being already installed and fail
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-e s':test_sdist_extra_files:_&:' \
+		-e s':test_command_hooks:_&:' \
+		-e s':test_sdist_git_extra_files:_&:' \
+		-i pbr/tests/test_core.py || die
+	sed -e s':test_command_hooks:_&:' \
+		-e s':test_global_setup_hooks:_&:' \
+		-i pbr/tests/test_hooks.py || die
+	sed \
+		-e "s:test_wsgi_script_install:_&:" \
+		-i pbr/tests/test_wsgi.py || die
+	einfo "rogue tests disabled"
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
new file mode 100644
index 000000000000..f6145fbc2831
--- /dev/null
+++ b/dev-python/phonenumbers/Manifest
@@ -0,0 +1 @@
+DIST phonenumbers-7.2.3.tar.gz 4252048 SHA256 7a9735fc1083ddf161e4eb2800cab11abd98b06b4f384c405e4752d654f0aab3 SHA512 73d544c963e4cf33b8cd2d73ba9e4df0c3c77bc2718358ef686a549a5c11d326c4fd73dd11cea97d814732d41021c51e0675d483d133bd44be38eb65ff443689 WHIRLPOOL c455961517ef805f246e8c65ed95a868da9b1c05a20a0d33024cd9435d751c1410dbcde5fbc6520df8ac322785c4339a46db79410e430d61b8ecf852e782c41e
diff --git a/dev-python/phonenumbers/metadata.xml b/dev-python/phonenumbers/metadata.xml
new file mode 100644
index 000000000000..13f6795bf794
--- /dev/null
+++ b/dev-python/phonenumbers/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>
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">daviddrysdale/python-phonenumbers</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/phonenumbers/phonenumbers-7.2.3.ebuild b/dev-python/phonenumbers/phonenumbers-7.2.3.ebuild
new file mode 100644
index 000000000000..e56e0fad2e7f
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-7.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=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="https://github.com/daviddrysdale/python-${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/python-${PN}-release-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
\ No newline at end of file
diff --git a/dev-python/pyee/Manifest b/dev-python/pyee/Manifest
new file mode 100644
index 000000000000..cf3ef9511d2d
--- /dev/null
+++ b/dev-python/pyee/Manifest
@@ -0,0 +1 @@
+DIST pyee-1.0.1.tar.gz 4056 SHA256 445c9cd811a53eeee3dd5649a02960eef142cbbf8f6fa10e5d31ebc4f8c78f68 SHA512 3072bd60f1ba596a1e65796cab652eab2f84f58e77741329f5c92bab926c3a01ca169eb1c8aea9fcff4d1a547643d709aec0ad13e182832ac52e9c22c91abdc6 WHIRLPOOL bfd350052e5a31099ca252354ba32f99f90403d2c86de79b590c1ba2ad94f1e5d6cfe0080b4648ef48e96745653d07c6872a8b30b19180b8acf18108c963f912
diff --git a/dev-python/pyee/metadata.xml b/dev-python/pyee/metadata.xml
new file mode 100644
index 000000000000..0019e45d3372
--- /dev/null
+++ b/dev-python/pyee/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyee</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyee/pyee-1.0.1.ebuild b/dev-python/pyee/pyee-1.0.1.ebuild
new file mode 100644
index 000000000000..cd07ea57ff1c
--- /dev/null
+++ b/dev-python/pyee/pyee-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A port of node.js's EventEmitter to python"
+HOMEPAGE="https://pypi.python.org/pypi/pyee https://github.com/jfhbrook/pyee"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-1.patch b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-1.patch
new file mode 100644
index 000000000000..3e2c06c1abd1
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-1.patch
@@ -0,0 +1,19 @@
+ OpenSSL/test/test_ssl.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
+index bb1c9ae..d3bffe7 100644
+--- a/OpenSSL/test/test_ssl.py
++++ b/OpenSSL/test/test_ssl.py
+@@ -1416,6 +1416,11 @@ class ContextTests(TestCase, _LoopbackMixin):
+         """
+         context = Context(TLSv1_METHOD)
+         for curve in get_elliptic_curves():
++            if curve.name.startswith(u"Oakley-"):
++                # Setting Oakley-EC2N-4 and Oakley-EC2N-3 adds
++                # ('bignum routines', 'BN_mod_inverse', 'no inverse') to the
++                # error queue on OpenSSL 1.0.2.
++                continue
+             # The only easily "assertable" thing is that it does not raise an
+             # exception.
+             context.set_tmp_ecdh(curve)
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-2.patch b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-2.patch
new file mode 100644
index 000000000000..be3c18039480
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-2.patch
@@ -0,0 +1,31 @@
+ OpenSSL/crypto.py           | 3 +++
+ OpenSSL/test/test_crypto.py | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py
+index 555ba24..2c1eddb 100644
+--- a/OpenSSL/crypto.py
++++ b/OpenSSL/crypto.py
+@@ -464,6 +464,9 @@ class X509Name(object):
+         if isinstance(value, _text_type):
+             value = value.encode('utf-8')
+ 
++        # Make it so OpenSSL generates utf-8 strings.
++        _lib.ASN1_STRING_set_default_mask_asc(b'utf8only')
++
+         add_result = _lib.X509_NAME_add_entry_by_NID(
+             self._name, nid, _lib.MBSTRING_UTF8, value, -1, -1, 0)
+         if not add_result:
+diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
+index 1620623..b817451 100644
+--- a/OpenSSL/test/test_crypto.py
++++ b/OpenSSL/test/test_crypto.py
+@@ -1003,7 +1003,7 @@ class X509NameTests(TestCase):
+         self.assertEqual(
+             a.der(),
+             b('0\x1b1\x0b0\t\x06\x03U\x04\x06\x13\x02US'
+-              '1\x0c0\n\x06\x03U\x04\x03\x13\x03foo'))
++              '1\x0c0\n\x06\x03U\x04\x03\x0c\x03foo'))
+ 
+ 
+     def test_get_components(self):
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport.patch b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport.patch
new file mode 100644
index 000000000000..048ede23786e
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport.patch
@@ -0,0 +1,84 @@
+From fc18f7bed12f58100c3a5eef3dbae29c9a26f18a Mon Sep 17 00:00:00 2001
+From: Jeff Tang <mrjefftang@users.noreply.github.com>
+Date: Wed, 15 Apr 2015 17:42:33 -0400
+Subject: [PATCH] OpenSSL 1.0.2 Compatibility
+
+- Perform the time comparison in python to fix #192
+- Add root cert has_expired test
+- Self sign test cert to fix issue in #149
+- Change test case to verify digest of a valid certficate
+---
+ OpenSSL/crypto.py           |  9 +++++----
+ OpenSSL/test/test_crypto.py | 15 +++++++++++++--
+ 2 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py
+index c7bdabc..1b1058e 100644
+--- a/OpenSSL/crypto.py
++++ b/OpenSSL/crypto.py
+@@ -1,5 +1,6 @@
+-from time import time
++from time import time, strptime
+ from base64 import b16encode
++from calendar import timegm
+ from functools import partial
+ from operator import __eq__, __ne__, __lt__, __le__, __gt__, __ge__
+ from warnings import warn as _warn
+@@ -1161,10 +1162,10 @@ def has_expired(self):
+         :return: True if the certificate has expired, false otherwise
+         """
+         now = int(time())
+-        notAfter = _lib.X509_get_notAfter(self._x509)
+-        return _lib.ASN1_UTCTIME_cmp_time_t(
+-            _ffi.cast('ASN1_UTCTIME*', notAfter), now) < 0
++        notAfter = self.get_notAfter().decode('utf-8')
++        notAfterSecs = timegm(strptime(notAfter, '%Y%m%d%H%M%SZ'))
+ 
++        return now > notAfterSecs
+ 
+     def _get_boundary_time(self, which):
+         return _get_asn1_time(which(self._x509))
+diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
+index 73e9cc7..b817451 100644
+--- a/OpenSSL/test/test_crypto.py
++++ b/OpenSSL/test/test_crypto.py
+@@ -1562,19 +1562,29 @@ def test_has_not_expired(self):
+         cert.gmtime_adj_notAfter(2)
+         self.assertFalse(cert.has_expired())
+ 
++    def test_root_has_not_expired(self):
++        """
++        :py:obj:`X509Type.has_expired` returns :py:obj:`False` if the certificate's not-after
++        time is in the future.
++        """
++        cert = load_certificate(FILETYPE_PEM, root_cert_pem)
++        self.assertFalse(cert.has_expired())
++
+ 
+     def test_digest(self):
+         """
+         :py:obj:`X509.digest` returns a string giving ":"-separated hex-encoded words
+         of the digest of the certificate.
+         """
+-        cert = X509()
++        cert = load_certificate(FILETYPE_PEM, root_cert_pem)
+         self.assertEqual(
+             # This is MD5 instead of GOOD_DIGEST because the digest algorithm
+             # actually matters to the assertion (ie, another arbitrary, good
+             # digest will not product the same digest).
++            # Digest verified with the command:
++            # openssl x509 -in root_cert.pem -noout -fingerprint -md5
+             cert.digest("MD5"),
+-            b("A8:EB:07:F8:53:25:0A:F2:56:05:C5:A5:C4:C4:C7:15"))
++            b("19:B3:05:26:2B:F8:F2:FF:0B:8F:21:07:A8:28:B8:75"))
+ 
+ 
+     def _extcert(self, pkey, extensions):
+@@ -1587,6 +1597,7 @@ def _extcert(self, pkey, extensions):
+         cert.set_notAfter(when)
+ 
+         cert.add_extensions(extensions)
++        cert.sign(pkey, 'sha1')
+         return load_certificate(
+             FILETYPE_PEM, dump_certificate(FILETYPE_PEM, cert))
+ 
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..0391eff6b536
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -0,0 +1,57 @@
+# 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="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+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"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openssl-1.0.2-backport.patch
+	"${FILESDIR}"/${P}-openssl-1.0.2-backport-1.patch
+	"${FILESDIR}"/${P}-openssl-1.0.2-backport-2.patch
+)
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	esetup.py test
+
+	# https://bugs.launchpad.net/pyopenssl/+bug/1237953
+	rm -rf tmp* *.key *.pem || die
+}
+
+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-ddp/Manifest b/dev-python/python-ddp/Manifest
new file mode 100644
index 000000000000..13def8a45e20
--- /dev/null
+++ b/dev-python/python-ddp/Manifest
@@ -0,0 +1 @@
+DIST python-ddp-0.1.5.tar.gz 6032 SHA256 1420f23e89c4ac378ba2f4b311ddcd032e0f0af4f79f8b0829cfad972d2e588f SHA512 25200624a4a2145d3189646c00ba023f1e55010ca1756eb36505f85b6faa24da8a505f2784b8c445232ed471d5d402b4c0f487b3c9460c948295cda74faa7fbb WHIRLPOOL a3c4f3a1570fd4e9c4e30efd11954d6d927bf22beaa47adb4772b43e4bf8f88e42079a263b3ce72647628308bf52e19681cb390041a14cfb9529f74a2cef679c
diff --git a/dev-python/python-ddp/metadata.xml b/dev-python/python-ddp/metadata.xml
new file mode 100644
index 000000000000..fdf80408a99b
--- /dev/null
+++ b/dev-python/python-ddp/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-ddp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ddp/python-ddp-0.1.5.ebuild b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
new file mode 100644
index 000000000000..8a9c1faed5b1
--- /dev/null
+++ b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="An event driven ddp client"
+HOMEPAGE="https://pypi.python.org/pypi/python-ddp https://github.com/hharnisc/python-ddp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/pyee[${PYTHON_USEDEP}]
+	dev-python/ws4py[${PYTHON_USEDEP}]
+	dev-python/meteor-ejson[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-meteor/Manifest b/dev-python/python-meteor/Manifest
new file mode 100644
index 000000000000..96bfb6f2525b
--- /dev/null
+++ b/dev-python/python-meteor/Manifest
@@ -0,0 +1 @@
+DIST python-meteor-0.1.6.tar.gz 7656 SHA256 014bd2fd61e73e8f67892a0114fbcb3185db3bc74f70990379aedb5b359a8667 SHA512 c654113714e7a4311d66d7390a996cce126bed2270e15f22791ddb8cec1afd5af321f24c8a83d8dc491c0959b8410fa91d43e2025534390486283f2da78a2233 WHIRLPOOL ab22fe7e64948b2c14aba8c67b36d1426b2183fb87a2c945521c81917f7d231a099101e1ff09a4d2a0e98565ad02947adebabf242ab11137e8a79f0bed2357ac
diff --git a/dev-python/python-meteor/metadata.xml b/dev-python/python-meteor/metadata.xml
new file mode 100644
index 000000000000..f2576bf50117
--- /dev/null
+++ b/dev-python/python-meteor/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-meteor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-meteor/python-meteor-0.1.6.ebuild b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
new file mode 100644
index 000000000000..9c7cfa8a75f2
--- /dev/null
+++ b/dev-python/python-meteor/python-meteor-0.1.6.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_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="An event driven meteor client"
+HOMEPAGE="https://pypi.python.org/pypi/python-meteor https://github.com/hharnisc/python-meteor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/python-ddp[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pyxattr/pyxattr-0.5.5.ebuild b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
index 207ae634aac4..d50e5f095b68 100644
--- a/dev-python/pyxattr/pyxattr-0.5.5.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="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="doc test"
 
 RDEPEND="sys-apps/attr"
diff --git a/dev-python/sexpdata/sexpdata-0.0.3.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
index dd2f50435505..345248f14d45 100644
--- a/dev-python/sexpdata/sexpdata-0.0.3.ebuild
+++ b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
@@ -1,10 +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
+EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
 
 inherit distutils-r1
 
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index 23271252a368..2f349590d86e 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,3 +1,3 @@
-DIST torment-3.0.0.tar.gz 33898 SHA256 ad3ead69f1c9e5ec1dc92a83bceca186f0d6a4544f983222c32c4d0a5e7f3b45 SHA512 1fac30a0e97a6505c7e9cbbfaa141e2378cf26345fd4679d6eff75a4472054771b2421b044f9ff0daa8671e1b27989508e7a9885dfb98e3a07bd3e842d4bbb77 WHIRLPOOL 353cd7a8b66f2936c5476e8e50e2f6428bdc6f4e0bdbb2ea99c93018ebe6587ad4d3c6310fd55fe21cbdefc3174425a34d10aa072cbc27ebcbe3f5f114f4c913
 DIST torment-3.0.1.tar.gz 33908 SHA256 06f4aa429fa68255512cd9fffbaefad85a06afe4bbc5e3c293c33a72184fe46d SHA512 c57451d18cf90204247054fcc9717d8b3587e8be38433d907f51703c3f571638793cc5078cc5ad9e0ffccd024251a086e2d1dd47ad92fea89cc65a8de6c2a7c1 WHIRLPOOL 50bc8f1fbcdf6553ecf21580b6e7df802235097ebad829cca1b964806e265fc401f7a5d4200267a9a6d3c11fbe7d5986177b2aa3d8032da4260cc33c3a794120
 DIST torment-3.0.2.tar.gz 33955 SHA256 64f053082bd4a1dbc1f4218ed359c45c27dd58ea1a0b62322249cb6d06ab52f9 SHA512 92361c2e4f5aed05e290be2de21648ec52040ffc77c693c177cbd99bbd98f443aa2adb5caf10bc8f7a44573c44a0148afe103d228af4ee00576bb9ff0a1d200f WHIRLPOOL d94c4785e93c6277ccd3d2ce68c650be00262f0451b04bb0cdc0e7d5ad84c27cc7a712e2219f4be3419c21f80b755593bc93ac11154b31fdd845b376caeab19c
+DIST torment-3.0.3.tar.gz 33976 SHA256 0c66837386df9286b4c66d4e8de5113e118dd44dcccdbeaa188bbfed67d94082 SHA512 85876668ce2ee898f876711aa11186ee2edb092ac1b768ee828670a6aef8bfc9cbcdee4aa07d8068ebed2edb60aa0774d74d2e7976a6c021ae5264aee1e83fbd WHIRLPOOL a1c83a225a0f7c7e16ee433e1a5980d6294c432ae612b8fbe9f7dc8959b8a42ad983974bf377b91a8f831f9acf142b611a47b1c7303c4cbaf004f6ac7b4b93ae
diff --git a/dev-python/torment/torment-3.0.0.ebuild b/dev-python/torment/torment-3.0.3.ebuild
index bafdaac857ea..8d182c3dd4f7 100644
--- a/dev-python/torment/torment-3.0.0.ebuild
+++ b/dev-python/torment/torment-3.0.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$
 
diff --git a/dev-python/tweepy/Manifest b/dev-python/tweepy/Manifest
index b05219b94660..cddeaa0a033b 100644
--- a/dev-python/tweepy/Manifest
+++ b/dev-python/tweepy/Manifest
@@ -1,2 +1,3 @@
 DIST tweepy-2.3.tar.gz 52352 SHA256 bce05e6375d03b42ba7fef2a972635be6841dd0f26b86bc5704154d248cd29d7 SHA512 23317a507174e108cf8d13232aa467d892aba1789ee4f610eef4f5503b045841b5c85e8ae63ddcfd1e07178afbf3bf9f4a9fed939426411a8566f1c949b9b831 WHIRLPOOL b9adc746e498a0bde90dcb0b4a3ea5c6817e41c39980436ca42364dab21493b0201de6fb16a196b9f9171150d46cc1ad5e121710aaa62bf16b0875d0c6f73cd7
 DIST tweepy-3.3.0.tar.gz 23624 SHA256 2eb0b1396a9dbb29568bb037e77f2123c504bdc4055ac011f2027f3833b27068 SHA512 ca50fa4989f4fe45850c56b8bf327e8eab4f2b6c00e0dd3ade67f60349861ebfc1daa68b7f55284b527951e321661e15df8c198a2ac35e20d4adf1d24bf9bee3 WHIRLPOOL a07325535089769d9c8c40fd451f46c51439f6b97b4627f0364000487f9742feefd6ae8932f7b80c937274f0e4a88be89475bb03c152e73ddd859ae6c7155b5a
+DIST tweepy-3.5.0.tar.gz 24348 SHA256 f00ccf5f48c30d559ce0b750dfe3b2df6668dc799d8ce276fd90bfaa68845a58 SHA512 cf87f0b7dea0ca444c17a3fdb9c2ebef814683c110511876c1997630b3202393276d3dd2de3b37fc21eb7a15382d22cc886109bda5a11b3d06a08081704c8c2a WHIRLPOOL 3fed8a0b7f7a388f386782731b004ba7f192534675372639c312be5fb09bb6a5f197366f88274d815ec0c5042f7803451e02eeac76fe61d3c1301539d36f2c57
diff --git a/dev-python/tweepy/tweepy-2.3.ebuild b/dev-python/tweepy/tweepy-2.3.ebuild
index 198729335bd2..5338366fdbbc 100644
--- a/dev-python/tweepy/tweepy-2.3.ebuild
+++ b/dev-python/tweepy/tweepy-2.3.ebuild
@@ -1,10 +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
 
 PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1 vcs-snapshot
 
@@ -17,9 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
-#RESTRICT="test" 	#missing a required dep frpm portage
+# online tests
+RESTRICT="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/httreplay[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
 
 python_prepare_all() {
 	# Required to avoid file collisions at install
@@ -30,7 +37,9 @@ python_prepare_all() {
 }
 
 python_test() {
-	"${PYTHON}" -m tests || die "Tests failed"
+	nosetests -v \
+		tests.test_api tests.test_streaming \
+		tests.test_cursors tests.test_utils || die
 }
 
 python_compile_all() {
diff --git a/dev-python/tweepy/tweepy-3.3.0.ebuild b/dev-python/tweepy/tweepy-3.3.0.ebuild
index 16cbb91c967a..71a693910579 100644
--- a/dev-python/tweepy/tweepy-3.3.0.ebuild
+++ b/dev-python/tweepy/tweepy-3.3.0.ebuild
@@ -1,10 +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
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
 
@@ -22,6 +23,7 @@ RESTRICT="test" 	#missing in tarball
 DEPEND="
 	dev-python/pip[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 	"
 RDEPEND="
 	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
@@ -37,7 +39,7 @@ python_prepare_all() {
 }
 
 python_test() {
-	"${PYTHON}" -m tests || die "Tests failed"
+	nosetests -v  -c tests/travis-tests.cfg || die
 }
 
 python_compile_all() {
diff --git a/dev-python/tweepy/tweepy-3.5.0.ebuild b/dev-python/tweepy/tweepy-3.5.0.ebuild
new file mode 100644
index 000000000000..71a693910579
--- /dev/null
+++ b/dev-python/tweepy/tweepy-3.5.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library for accessing the Twitter API "
+HOMEPAGE="https://tweepy.github.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RESTRICT="test" 	#missing in tarball
+
+DEPEND="
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+RDEPEND="
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]
+"
+python_prepare_all() {
+	# Required to avoid file collisions at install
+	sed \
+		-e "/find_packages/s:]:,'tests.*','examples']:g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v  -c tests/travis-tests.cfg || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+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/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch b/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
new file mode 100644
index 000000000000..0e48643a85cc
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
@@ -0,0 +1,144 @@
+ docs/changes.rst |  3 ++
+ virtualenv.py    | 92 +++++++++++++++++++++++++++++---------------------------
+ 2 files changed, 50 insertions(+), 45 deletions(-)
+
+diff --git a/docs/changes.rst b/docs/changes.rst
+index 80c3dc1..1d9c1fe 100644
+--- a/docs/changes.rst
++++ b/docs/changes.rst
+@@ -1,6 +1,9 @@
+ Release History
+ ===============
+ 
++* Remove virtualenv file's path from directory when executing with a new
++  python. Fixes issue #779, #763 (PR #805)
++
+ 13.1.2 (2015-08-23)
+ ~~~~~~~~~~~~~~~~~~~
+ 
+diff --git a/virtualenv.py b/virtualenv.py
+index da25205..64e70d4 100755
+--- a/virtualenv.py
++++ b/virtualenv.py
+@@ -5,9 +5,22 @@
+ __version__ = "13.1.2"
+ virtualenv_version = __version__  # legacy
+ 
+-import base64
+-import sys
+ import os
++import sys
++
++# If we are running in a new interpreter to create a virtualenv,
++# we do NOT want paths from our existing location interfering with anything,
++# So we remove this file's directory from sys.path - most likely to be
++# the previous interpreter's site-packages. Solves #705, #763, #779
++if os.environ.get('VIRTUALENV_INTERPRETER_RUNNING'):
++    del_paths = []
++    for path in sys.path:
++        if os.path.realpath(os.path.dirname(__file__)) == os.path.realpath(path):
++            del_paths.append(path)
++    for path in del_paths:
++        sys.path.remove(path)
++
++import base64
+ import codecs
+ import optparse
+ import re
+@@ -23,6 +36,11 @@ import struct
+ import subprocess
+ import tarfile
+ 
++try:
++    import ConfigParser
++except ImportError:
++    import configparser as ConfigParser
++
+ if sys.version_info < (2, 6):
+     print('ERROR: %s' % sys.exc_info()[1])
+     print('ERROR: this script requires Python 2.6 or greater.')
+@@ -33,11 +51,6 @@ try:
+ except NameError:
+     basestring = str
+ 
+-try:
+-    import ConfigParser
+-except ImportError:
+-    import configparser as ConfigParser
+-
+ join = os.path.join
+ py_version = 'python%s.%s' % (sys.version_info[0], sys.version_info[1])
+ 
+@@ -1096,45 +1109,34 @@ def change_prefix(filename, dst_prefix):
+ 
+ def copy_required_modules(dst_prefix, symlink):
+     import imp
+-    # If we are running under -p, we need to remove the current
+-    # directory from sys.path temporarily here, so that we
+-    # definitely get the modules from the site directory of
+-    # the interpreter we are running under, not the one
+-    # virtualenv.py is installed under (which might lead to py2/py3
+-    # incompatibility issues)
+-    _prev_sys_path = sys.path
+-    if os.environ.get('VIRTUALENV_INTERPRETER_RUNNING'):
+-        sys.path = sys.path[1:]
+-    try:
+-        for modname in REQUIRED_MODULES:
+-            if modname in sys.builtin_module_names:
+-                logger.info("Ignoring built-in bootstrap module: %s" % modname)
+-                continue
+-            try:
+-                f, filename, _ = imp.find_module(modname)
+-            except ImportError:
+-                logger.info("Cannot import bootstrap module: %s" % modname)
++
++    for modname in REQUIRED_MODULES:
++        if modname in sys.builtin_module_names:
++            logger.info("Ignoring built-in bootstrap module: %s" % modname)
++            continue
++        try:
++            f, filename, _ = imp.find_module(modname)
++        except ImportError:
++            logger.info("Cannot import bootstrap module: %s" % modname)
++        else:
++            if f is not None:
++                f.close()
++            # special-case custom readline.so on OS X, but not for pypy:
++            if modname == 'readline' and sys.platform == 'darwin' and not (
++                    is_pypy or filename.endswith(join('lib-dynload', 'readline.so'))):
++                dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:3], 'readline.so')
++            elif modname == 'readline' and sys.platform == 'win32':
++                # special-case for Windows, where readline is not a
++                # standard module, though it may have been installed in
++                # site-packages by a third-party package
++                pass
+             else:
+-                if f is not None:
+-                    f.close()
+-                # special-case custom readline.so on OS X, but not for pypy:
+-                if modname == 'readline' and sys.platform == 'darwin' and not (
+-                        is_pypy or filename.endswith(join('lib-dynload', 'readline.so'))):
+-                    dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:3], 'readline.so')
+-                elif modname == 'readline' and sys.platform == 'win32':
+-                    # special-case for Windows, where readline is not a
+-                    # standard module, though it may have been installed in
+-                    # site-packages by a third-party package
+-                    pass
+-                else:
+-                    dst_filename = change_prefix(filename, dst_prefix)
+-                copyfile(filename, dst_filename, symlink)
+-                if filename.endswith('.pyc'):
+-                    pyfile = filename[:-1]
+-                    if os.path.exists(pyfile):
+-                        copyfile(pyfile, dst_filename[:-1], symlink)
+-    finally:
+-        sys.path = _prev_sys_path
++                dst_filename = change_prefix(filename, dst_prefix)
++            copyfile(filename, dst_filename, symlink)
++            if filename.endswith('.pyc'):
++                pyfile = filename[:-1]
++                if os.path.exists(pyfile):
++                    copyfile(pyfile, dst_filename[:-1], symlink)
+ 
+ 
+ def subst_path(prefix_path, prefix, home_dir):
diff --git a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
new file mode 100644
index 000000000000..13c85a33ab78
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-13.1.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=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	http://www.virtualenv.org/
+	https://pypi.python.org/pypi/virtualenv
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
+	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
+	"${FILESDIR}"/${P}-PYTHONPATH-backport.patch
+)
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webencodings/files/webencodings-0.4-test-fix-backport.patch b/dev-python/webencodings/files/webencodings-0.4-test-fix-backport.patch
new file mode 100644
index 000000000000..4b42bb16e65e
--- /dev/null
+++ b/dev-python/webencodings/files/webencodings-0.4-test-fix-backport.patch
@@ -0,0 +1,71 @@
+From 87044de0d2640cf9a8f941dec1fc79c679e7fa2d Mon Sep 17 00:00:00 2001
+From: Geoffrey Sneddon <me@gsnedders.com>
+Date: Sun, 17 Jan 2016 16:50:58 +0100
+Subject: [PATCH] Fix #2: get tests passing again after decode API change
+
+---
+ webencodings/tests.py | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/webencodings/tests.py b/webencodings/tests.py
+index e0297d9..b8c5653 100644
+--- a/webencodings/tests.py
++++ b/webencodings/tests.py
+@@ -47,7 +47,7 @@ def test_labels():
+ 
+ def test_all_labels():
+     for label in LABELS:
+-        assert decode(b'', label) == ''
++        assert decode(b'', label) == ('', lookup(label))
+         assert encode('', label) == b''
+         for repeat in [0, 1, 12]:
+             output, _ = iter_decode([b''] * repeat, label)
+@@ -74,25 +74,25 @@ def test_invalid_label():
+ 
+ 
+ def test_decode():
+-    assert decode(b'\x80', 'latin1') == '€'
+-    assert decode(b'\x80', lookup('latin1')) == '€'
+-    assert decode(b'\xc3\xa9', 'utf8') == 'é'
+-    assert decode(b'\xc3\xa9', UTF8) == 'é'
+-    assert decode(b'\xc3\xa9', 'ascii') == 'é'
+-    assert decode(b'\xEF\xBB\xBF\xc3\xa9', 'ascii') == 'é'  # UTF-8 with BOM
++    assert decode(b'\x80', 'latin1') == ('€', lookup('latin1'))
++    assert decode(b'\x80', lookup('latin1')) == ('€', lookup('latin1'))
++    assert decode(b'\xc3\xa9', 'utf8') == ('é', lookup('utf8'))
++    assert decode(b'\xc3\xa9', UTF8) == ('é', lookup('utf8'))
++    assert decode(b'\xc3\xa9', 'ascii') == ('é', lookup('ascii'))
++    assert decode(b'\xEF\xBB\xBF\xc3\xa9', 'ascii') == ('é', lookup('utf8'))  # UTF-8 with BOM
+ 
+-    assert decode(b'\xFE\xFF\x00\xe9', 'ascii') == 'é'  # UTF-16-BE with BOM
+-    assert decode(b'\xFF\xFE\xe9\x00', 'ascii') == 'é'  # UTF-16-LE with BOM
+-    assert decode(b'\xFE\xFF\xe9\x00', 'ascii') == '\ue900'
+-    assert decode(b'\xFF\xFE\x00\xe9', 'ascii') == '\ue900'
++    assert decode(b'\xFE\xFF\x00\xe9', 'ascii') == ('é', lookup('utf-16be'))  # UTF-16-BE with BOM
++    assert decode(b'\xFF\xFE\xe9\x00', 'ascii') == ('é', lookup('utf-16le'))  # UTF-16-LE with BOM
++    assert decode(b'\xFE\xFF\xe9\x00', 'ascii') == ('\ue900', lookup('utf-16be'))
++    assert decode(b'\xFF\xFE\x00\xe9', 'ascii') == ('\ue900', lookup('utf-16le'))
+ 
+-    assert decode(b'\x00\xe9', 'UTF-16BE') == 'é'
+-    assert decode(b'\xe9\x00', 'UTF-16LE') == 'é'
+-    assert decode(b'\xe9\x00', 'UTF-16') == 'é'
++    assert decode(b'\x00\xe9', 'UTF-16BE') == ('é', lookup('utf-16be'))
++    assert decode(b'\xe9\x00', 'UTF-16LE') == ('é', lookup('utf-16le'))
++    assert decode(b'\xe9\x00', 'UTF-16') == ('é', lookup('utf-16le'))
+ 
+-    assert decode(b'\xe9\x00', 'UTF-16BE') == '\ue900'
+-    assert decode(b'\x00\xe9', 'UTF-16LE') == '\ue900'
+-    assert decode(b'\x00\xe9', 'UTF-16') == '\ue900'
++    assert decode(b'\xe9\x00', 'UTF-16BE') == ('\ue900', lookup('utf-16be'))
++    assert decode(b'\x00\xe9', 'UTF-16LE') == ('\ue900', lookup('utf-16le'))
++    assert decode(b'\x00\xe9', 'UTF-16') == ('\ue900', lookup('utf-16le'))
+ 
+ 
+ def test_encode():
+@@ -149,5 +149,5 @@ def test_x_user_defined():
+     decoded = '2,\x0c\x0b\x1aO\uf7d9#\uf7cb\x0f\uf7c9\uf7bbt\uf7cf\uf7a8\uf7ca'
+     encoded = b'aa'
+     decoded = 'aa'
+-    assert decode(encoded, 'x-user-defined') == decoded
++    assert decode(encoded, 'x-user-defined') == (decoded, lookup('x-user-defined'))
+     assert encode(decoded, 'x-user-defined') == encoded
diff --git a/dev-python/webencodings/webencodings-0.4.ebuild b/dev-python/webencodings/webencodings-0.4.ebuild
index 219c1827bed1..7898dc69775e 100644
--- a/dev-python/webencodings/webencodings-0.4.ebuild
+++ b/dev-python/webencodings/webencodings-0.4.ebuild
@@ -24,13 +24,18 @@ DEPEND="${REDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
-# https://github.com/SimonSapin/python-webencodings/issues/2
-RESTRICT=test
+PATCHES=(
+	"${FILESDIR}"/${P}-test-fix-backport.patch
+)
 
-python_test() {
+python_prepare_all(){
 	cat >> setup.cfg <<- EOF
 	[pytest]
 	python_files=test*.py
 	EOF
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
 	py.test -v -v || die
 }
diff --git a/dev-python/xcffib/xcffib-0.4.0.ebuild b/dev-python/xcffib/xcffib-0.4.0.ebuild
index c75e96be4ae9..1d0f111fde60 100644
--- a/dev-python/xcffib/xcffib-0.4.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.4.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=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.5.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.5.ebuild
index 06c976d31212..82798c520835 100644
--- a/dev-ruby/actionmailer/actionmailer-4.2.5.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-4.2.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="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
diff --git a/dev-ruby/actionpack/actionpack-4.2.5.ebuild b/dev-ruby/actionpack/actionpack-4.2.5.ebuild
index ad7e3ea34c12..95809507bc19 100644
--- a/dev-ruby/actionpack/actionpack-4.2.5.ebuild
+++ b/dev-ruby/actionpack/actionpack-4.2.5.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="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -45,7 +45,7 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	rm ../Gemfile.lock || die
diff --git a/dev-ruby/actionview/actionview-4.2.5.ebuild b/dev-ruby/actionview/actionview-4.2.5.ebuild
index 6a7526af7652..5a093fd106e0 100644
--- a/dev-ruby/actionview/actionview-4.2.5.ebuild
+++ b/dev-ruby/actionview/actionview-4.2.5.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="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -43,7 +43,7 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	rm ../Gemfile.lock || die
diff --git a/dev-ruby/activejob/activejob-4.2.5.ebuild b/dev-ruby/activejob/activejob-4.2.5.ebuild
index 7f62876aebb7..7ec460628d84 100644
--- a/dev-ruby/activejob/activejob-4.2.5.ebuild
+++ b/dev-ruby/activejob/activejob-4.2.5.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="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/activemodel/activemodel-4.2.5.ebuild b/dev-ruby/activemodel/activemodel-4.2.5.ebuild
index 465c90bd8103..a4b69d5d24dc 100644
--- a/dev-ruby/activemodel/activemodel-4.2.5.ebuild
+++ b/dev-ruby/activemodel/activemodel-4.2.5.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="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/activerecord/activerecord-4.2.5.ebuild b/dev-ruby/activerecord/activerecord-4.2.5.ebuild
index 9da4868da977..a347afbd897d 100644
--- a/dev-ruby/activerecord/activerecord-4.2.5.ebuild
+++ b/dev-ruby/activerecord/activerecord-4.2.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="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -47,7 +47,7 @@ all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
 	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
diff --git a/dev-ruby/activesupport/activesupport-4.2.5.ebuild b/dev-ruby/activesupport/activesupport-4.2.5.ebuild
index b8476a9a5eac..5615eadbba5c 100644
--- a/dev-ruby/activesupport/activesupport-4.2.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-4.2.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index ac840966b569..b3a9124d8278 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,2 +1,3 @@
 DIST asciidoctor-1.5.2.tar.gz 494239 SHA256 f10242d7ea5e8c3b6279c9535e67d58fb0b8ffe2c5625e7b211af3dd683dd368 SHA512 5d50134d4bed58bb5dc610929c30b1272c8d75e9748f6587a4e00cd8d76b4f86e8edd17b04a8579d984e9ce3864c3d96a81bc526988a6c6d71e418923c94d67a WHIRLPOOL 67cf1cdd71dd4819c2d829d729057ec0b7b6ac107a5754333eb257a80545c4229870a1ae83b14172bd52e5e8b145bc1f56db6bca6af341d6ee7ca6b63267e7c8
 DIST asciidoctor-1.5.3.tar.gz 509233 SHA256 b6aa27203bf9fc8ca55d0c0468f8f3e70ae1b3aa60f1bb50dd6aa53497275841 SHA512 17e5c930b2d2d1727b5b5f2100f6b625edf3af73e98aadf84135bdf01bbbef8587b310fe513508ae575ee6b8a08d573ac512fbfc3d6e9ea9e144048786865c35 WHIRLPOOL 9333bee73633e18b9c334d6f622df07e8d07c1a491852b710b2edc31c892ebbc00e2d915a9234253f7a13611988f8d53e3a791a73e4ca6cbd82e90444dce9fe1
+DIST asciidoctor-1.5.4.tar.gz 520793 SHA256 2963fdf5ce12962e3a514d7d83426897184c947de5df89300ee524970dc2f3bc SHA512 c3a6405a6c39d1aa70e4d10ce42a6f6e01f3b7ddd8f695e8043fce9116ac91ad1f1f881a449ee8a61172213720dae1285f9c4de03a5cec908de906ed5b14e626 WHIRLPOOL bb06147e6c77fc5d0133b0b747103ec362cc724624087cb84756b2a193540e6b164aed1c8a20a1578298be135e7b65938ae07a902409ba778c25792bd6350ec9
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.4.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.4.ebuild
new file mode 100644
index 000000000000..a1aa82a593b8
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.4.ebuild
@@ -0,0 +1,44 @@
+# 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_TEST="test features"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-util/cucumber
+	dev-ruby/rspec-expectations:*
+	dev-ruby/asciimath
+	dev-ruby/coderay
+	dev-ruby/erubis
+	dev-ruby/haml
+	dev-ruby/nokogiri
+	dev-ruby/slim
+	dev-ruby/tilt )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/asciidoctor.1
+}
diff --git a/dev-ruby/async_sinatra/Manifest b/dev-ruby/async_sinatra/Manifest
index 1893c8c4e52e..4cd8c9b13b09 100644
--- a/dev-ruby/async_sinatra/Manifest
+++ b/dev-ruby/async_sinatra/Manifest
@@ -1 +1,2 @@
 DIST async_sinatra-1.2.0-git.tgz 8194 SHA256 b62f1f7944fe2816fe418c9acf64ca73c2708b6ebd3bfa6e06dc693703faaa0a SHA512 abddfd78e6e6d1dbee8e463a10f3e233045f3321a828267e666399853fc6e1ab7661b8338193f1437cd9ef891a15323667b8f1e3dc89f2acc6ccc34b2aa16a6e WHIRLPOOL 109ececfd95de28e27a5c8be0b010690d1054db993cb764a2d5ac43edae9a5ccd031b75638523f568496bcdf7b0c67d23cfa1e209820bad1831686a5391ebaec
+DIST async_sinatra-1.2.1-git.tgz 8314 SHA256 431d5b229d2e795707184caaf9e9bf0d4e1cb3402b9bfa9d7a6ee624f6ca8712 SHA512 f1c7dc5aeeae366836bc2db6ae1c34967fa4a8d89d2f0fdcbcfeb7737e7b39615990c67ba9d55428cc0873329b5b54e9a1df727b09c5d79b03210b4e209b56ba WHIRLPOOL d13fa0d3e19a3b4a22d8b8321248a635e8ca17ed78f1ec39f38bf2a3130e4d37fe2a929a28df9032ea5b9b8c8329b80fa43d1baf6284ff3a1285b08dc810e243
diff --git a/dev-ruby/async_sinatra/async_sinatra-1.2.1.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.2.1.ebuild
new file mode 100644
index 000000000000..0ddbeb83b984
--- /dev/null
+++ b/dev-ruby/async_sinatra/async_sinatra-1.2.1.ebuild
@@ -0,0 +1,44 @@
+# 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Asynchronous response API for Sinatra and Thin"
+HOMEPAGE="https://github.com/raggi/async_sinatra"
+SRC_URI="https://github.com/raggi/async_sinatra/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/hoe-3.13
+	>=dev-ruby/minitest-5.6:5
+	>=dev-ruby/eventmachine-0.12.11
+	dev-ruby/rack-test
+	)"
+ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
+
+ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2
+	>=dev-ruby/rack-1.4.1:*"
+
+all_ruby_prepare() {
+	# Remove development dependencies that we don't have from the gemspec
+	sed -i -e '/\(hoe\|rdoc\)/d' async_sinatra.gemspec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/
+	doins -r examples || die "Failed to install examples"
+}
diff --git a/dev-ruby/celluloid-essentials/celluloid-essentials-0.20.5.ebuild b/dev-ruby/celluloid-essentials/celluloid-essentials-0.20.5.ebuild
index e7c1133975ab..6583ce3dc747 100644
--- a/dev-ruby/celluloid-essentials/celluloid-essentials-0.20.5.ebuild
+++ b/dev-ruby/celluloid-essentials/celluloid-essentials-0.20.5.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/timers-4.1.1"
diff --git a/dev-ruby/celluloid-extras/celluloid-extras-0.20.5.ebuild b/dev-ruby/celluloid-extras/celluloid-extras-0.20.5.ebuild
index 3f11aa08da04..a6a5d079d247 100644
--- a/dev-ruby/celluloid-extras/celluloid-extras-0.20.5.ebuild
+++ b/dev-ruby/celluloid-extras/celluloid-extras-0.20.5.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/timers-4.1.1"
diff --git a/dev-ruby/celluloid-fsm/celluloid-fsm-0.20.5.ebuild b/dev-ruby/celluloid-fsm/celluloid-fsm-0.20.5.ebuild
index 37c22413bbad..b051bb516afa 100644
--- a/dev-ruby/celluloid-fsm/celluloid-fsm-0.20.5.ebuild
+++ b/dev-ruby/celluloid-fsm/celluloid-fsm-0.20.5.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/timers-4.1.1"
diff --git a/dev-ruby/celluloid-pool/celluloid-pool-0.20.5.ebuild b/dev-ruby/celluloid-pool/celluloid-pool-0.20.5.ebuild
index 37c22413bbad..b051bb516afa 100644
--- a/dev-ruby/celluloid-pool/celluloid-pool-0.20.5.ebuild
+++ b/dev-ruby/celluloid-pool/celluloid-pool-0.20.5.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/timers-4.1.1"
diff --git a/dev-ruby/celluloid-supervision/celluloid-supervision-0.20.5.ebuild b/dev-ruby/celluloid-supervision/celluloid-supervision-0.20.5.ebuild
index 37c22413bbad..b051bb516afa 100644
--- a/dev-ruby/celluloid-supervision/celluloid-supervision-0.20.5.ebuild
+++ b/dev-ruby/celluloid-supervision/celluloid-supervision-0.20.5.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/timers-4.1.1"
diff --git a/dev-ruby/celluloid/celluloid-0.17.2.ebuild b/dev-ruby/celluloid/celluloid-0.17.2.ebuild
index 6f56ed0a3fec..68e5e87f1d02 100644
--- a/dev-ruby/celluloid/celluloid-0.17.2.ebuild
+++ b/dev-ruby/celluloid/celluloid-0.17.2.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/celluloid-essentials
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
new file mode 100644
index 000000000000..d5f7425b85d7
--- /dev/null
+++ b/dev-ruby/coffee-rails/coffee-rails-4.1.1-r1.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"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
+HOMEPAGE="https://github.com/rails/coffee-rails"
+SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
+	>dev-ruby/railties-4:* <dev-ruby/railties-5.1:*"
+
+all_ruby_prepare() {
+	# Avoid dependency on git and bundler.
+	sed -i -e 's/git ls-files/echo/' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+
+	# Make sure a consistent rails version is loaded.
+	sed -i -e '4igem "rails"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
index 9cbbac32775c..93274dbc3c16 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
@@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index aa36d6dc4650..5838d9512fb7 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,2 +1,3 @@
 DIST dnsruby-1.58.0.gem 230912 SHA256 b21ded4f62fd935f1c2409201ed5f2b97f90f2598baab00e1a6ec0be0149c16d SHA512 e7fc9073574429433aa05d088bfafd8919216f8461d25b967fccad52d22dd820702ae62d503f9b63207a25d335675f1601c2654685493165c1ad4ef912f5cebe WHIRLPOOL daf1427ad9947cd478b70ec39c72bdfc58059e448dad7e7d40f828ef56b9b49f1d31497f820e5ba118f15902a90424042a3f46396a34de2189dd87a0f0b17139
 DIST dnsruby-1.59.0.gem 232960 SHA256 45d7236b1d6346fca03522e3192f9545875d887c491d1e63c4dcedf6a87819b8 SHA512 769111d24fd745288b41e083630e7ea7cd078ff6297afe8eff7eb0a95f57a74c9b1dbfd09db122eb45c340243e1eaee86faa3175e750c2b243ac6b92f7c3a804 WHIRLPOOL b9c0f858346d9bb38a92dc4a67fefc3f6dd7fedc468a7ab2b9794fa528c0a7d80426402ee5a812d4598d7177f7b19959d0ca13401a55967ecfca63692997b2b4
+DIST dnsruby-1.59.1.gem 233984 SHA256 ffc1e7c98eb7d57e1325736654193a047d0e384c678ac2996c7a4e58245a649a SHA512 809072ae82056aeb9be085713116412b8cf6b21313c4aba1b112c0526f06d4ba1068e66149265f9fe0effd604641392732d09c28fd31a048a4d460fbf59f884e WHIRLPOOL b1a76dfab5598bcd3eb3c3181b0c0abe1c229e5d470eabbfa538f95ddbfb1b905533a1189ea8515063512bea067b34ff96a077a366740ef0f34d78892fd08181
diff --git a/dev-ruby/dnsruby/dnsruby-1.59.1.ebuild b/dev-ruby/dnsruby/dnsruby-1.59.1.ebuild
new file mode 100644
index 000000000000..90451b8bec87
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.59.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
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/dotenv/dotenv-2.0.2.ebuild b/dev-ruby/dotenv/dotenv-2.0.2.ebuild
index 99242c9150a2..85fc2bac5f0b 100644
--- a/dev-ruby/dotenv/dotenv-2.0.2.ebuild
+++ b/dev-ruby/dotenv/dotenv-2.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bkeepers/dotenv"
 SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/globalid/globalid-0.3.6.ebuild b/dev-ruby/globalid/globalid-0.3.6.ebuild
index c4a9e6644331..3dd38bae95ba 100644
--- a/dev-ruby/globalid/globalid-0.3.6.ebuild
+++ b/dev-ruby/globalid/globalid-0.3.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_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/haml/haml-4.0.7.ebuild b/dev-ruby/haml/haml-4.0.7.ebuild
index d7092de1f112..e79a24eb38d2 100644
--- a/dev-ruby/haml/haml-4.0.7.ebuild
+++ b/dev-ruby/haml/haml-4.0.7.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"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
index 0ab480d3145e..a35f0b2e1c0f 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/hoe-seattlerb"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
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 cc737d7458df..fe2ad735ce58 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.1.0.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.1.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/minitest/minitest-5.3.3-r1.ebuild b/dev-ruby/minitest/minitest-5.3.3-r1.ebuild
index be3318b398e2..9d9de5253a65 100644
--- a/dev-ruby/minitest/minitest-5.3.3-r1.ebuild
+++ b/dev-ruby/minitest/minitest-5.3.3-r1.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_DOC="rdoc"
 
diff --git a/dev-ruby/nenv/nenv-0.2.0.ebuild b/dev-ruby/nenv/nenv-0.2.0.ebuild
index 84c40a477307..1c7486b5a6a2 100644
--- a/dev-ruby/nenv/nenv-0.2.0.ebuild
+++ b/dev-ruby/nenv/nenv-0.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/e2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
index a6e0ab828ae6..f05e4fd004de 100644
--- a/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
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 01ec43206d5d..a3394d71bce1 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
@@ -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_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rails-dom-testing/Manifest b/dev-ruby/rails-dom-testing/Manifest
index be2c24e42f12..631de04a52b7 100644
--- a/dev-ruby/rails-dom-testing/Manifest
+++ b/dev-ruby/rails-dom-testing/Manifest
@@ -1,3 +1 @@
-DIST rails-dom-testing-1.0.5.gem 16896 SHA256 35a6b222f33e98bc8c0401cea57aaf155c5a7ab75748e219071538dd096f6f13 SHA512 49b363f89a21af84f4f502284dc4802de2c324f4129c6653c96b548bacd35492b1ca11ae6d631cfc3b777f66ab2cbcccfa9714e7971221ddecd7d296441f6b14 WHIRLPOOL a9f04238acde83b174e85c315d48a4f416eaa08ba07461093dd9fd5abb3dab4213c119d493009489dc8cea203300684fd5c36f811e6ede66c8800f54bf8150a0
-DIST rails-dom-testing-1.0.6.gem 17408 SHA256 a7b69cc95c84b5eb8e3fc6cd77726e409475415223c298647b61ffa33d849dd7 SHA512 56884897b6a2b890920c689412e92489e33979f1c7f55c0d1b82fb0256ca85a32c383f4924cad524e10f95bcc75bb16680ff05460082478491800e5ede71591e WHIRLPOOL b24450c5bb4df0d882463e2d11ea2813c04cd7f8136296bc8f9f0787d7d18ccbcd869358060cbcf4bf2f2a09f6698707410e6e731d913ff94705b3b888229e13
 DIST rails-dom-testing-1.0.7.gem 17408 SHA256 6813821425ff44ae3188162d0bae1a2ae08080fc1a584860bf78d50190a112ed SHA512 29999b404e1c0ab8dea2f173feff606c57646fc893be53496d2972b6afbd3b010c0238cfc7be39c088ef2f8ab6421a7ddad5a5b5da2646264a5a7c33d650a26b WHIRLPOOL 47b3fe998bd3d3b008e5c7b70736c633316e47c7de5fbfe774dfa4aa45b72dbe4f05bc380fe3cb5d012ec8ff6e818a44d544b67f83c6ed99ee24f1ec80c876e1
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.5.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.5.ebuild
deleted file mode 100644
index 9ed4ace51431..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.5.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
-HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/nokogiri-1.6.0
-	>=dev-ruby/rails-deprecated_sanitizer-1.0.1"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.6.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.6.ebuild
deleted file mode 100644
index 9ed4ace51431..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.6.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
-HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/nokogiri-1.6.0
-	>=dev-ruby/rails-deprecated_sanitizer-1.0.1"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
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 1984a7b9a435..29f5eef84322 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
@@ -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_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.2.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.2.ebuild
index 081f5daae292..f7cc8327f220 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.2.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.2.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_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/rails/rails-4.2.5.ebuild b/dev-ruby/rails/rails-4.2.5.ebuild
index 29faf7115a15..afa0052fb706 100644
--- a/dev-ruby/rails/rails-4.2.5.ebuild
+++ b/dev-ruby/rails/rails-4.2.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"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_BINWRAP=""
 
diff --git a/dev-ruby/railties/railties-4.2.5.ebuild b/dev-ruby/railties/railties-4.2.5.ebuild
index c24a84fd5870..8a14333e8185 100644
--- a/dev-ruby/railties/railties-4.2.5.ebuild
+++ b/dev-ruby/railties/railties-4.2.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="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="test:regular"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild b/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
index 85d03babb183..e9d222be9971 100644
--- a/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 SRC_URI="https://github.com/luislavena/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 RUBY_S="luislavena-${PN}-*"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index b4ebd69147dd..881bcc1034a1 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1 +1,2 @@
 DIST regexp_parser-0.3.1.gem 94208 SHA256 97cc69fa4174b44889f12f5d1d36fe6147464066231a8ba5a767c4a5f0d081a4 SHA512 afb2a64215d5fd738d9cb5799067f91c43a8377a8dfcb749c915c3ea8ef340c7138561b6bb93116337ae559a4ad797a7dfcd0f8663f3779a3d38d0ebbba40d91 WHIRLPOOL 378f5f4cba7638df84e0dfd45127f5f5981c2840378d48cacc8655877b550221f0d3ff2464d0357fc8e506b3708565d1364b2c04e0bbdf7301424cf1ddd2c624
+DIST regexp_parser-0.3.2.gem 94720 SHA256 147d6d2b4f7e10c3ef96801176cd9c8c811c6a923bcda4ffd6055d9bfb6eaa1f SHA512 4a53a54136936bec98be7828372d132ffb8fc809f6e989eb584d6037a44714efa707eaf27e3dc41072243b3db4a80be69dbf9e0065d7f5b2014d06f5b94b11ba WHIRLPOOL 0d8ef2b357c20d1f7eb5b5d391cf166f3faefb9115ba20beb16519d07ebc18581277c46f7c3ed7990c718766ff06b3dd4611ecbc0e53410b7d8bda8d002046bd
diff --git a/dev-ruby/regexp_parser/regexp_parser-0.3.2.ebuild b/dev-ruby/regexp_parser/regexp_parser-0.3.2.ebuild
new file mode 100644
index 000000000000..169cc688f2cd
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-0.3.2.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 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/request_store/request_store-1.0.5.ebuild b/dev-ruby/request_store/request_store-1.0.5.ebuild
index bdbb65bcfa28..540736f2dd9b 100644
--- a/dev-ruby/request_store/request_store-1.0.5.ebuild
+++ b/dev-ruby/request_store/request_store-1.0.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$
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/steveklabnik/request_store"
 
 LICENSE="MIT"
 SLOT="1.0.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_all_prepare() {
diff --git a/dev-ruby/request_store/request_store-1.3.0.ebuild b/dev-ruby/request_store/request_store-1.3.0.ebuild
index 29ed697bad60..c45b7b559cd6 100644
--- a/dev-ruby/request_store/request_store-1.3.0.ebuild
+++ b/dev-ruby/request_store/request_store-1.3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/steveklabnik/request_store"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
index cc45d1f19b57..05820478f46e 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
index 4616b991b553..4dc96b02a76a 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
index 6331785ab12a..d446deb33933 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.4.5.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.4.5.ebuild
index bb35c9a5a3fb..041241c76829 100644
--- a/dev-ruby/rspec-retry/rspec-retry-0.4.5.ebuild
+++ b/dev-ruby/rspec-retry/rspec-retry-0.4.5.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
 	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
index 5cefd5b9024d..89aa78c212e4 100644
--- a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
+++ b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby-beautify/Manifest b/dev-ruby/ruby-beautify/Manifest
index 903a2bcb3c56..2db4e2e36399 100644
--- a/dev-ruby/ruby-beautify/Manifest
+++ b/dev-ruby/ruby-beautify/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-beautify-0.93.2.gem 9216 SHA256 6b2ca9d69495b66d35569a3fe895485063b9f506d0002b970ec88bc778ffd366 SHA512 ff2d97020d1a4c394e26387cd92b6e4b04066f539cd28ed2c3b122606a2e2aea18939373c1d23e229e4ae17bb670b8dbe109d9b45c86e3a5c59614babd212cac WHIRLPOOL ed2867b02001acbfb15465aaff737cddf79672cf4d1cefac8d5734b73aa50c4b3043796d19f887192f9c95383e80583435d9a818ee8b50f06673ee6f74815aaa
 DIST ruby-beautify-0.97.3.gem 14848 SHA256 aa7d0fb34a5d878a686d0b950fa572addb4d3ea1bb7dac4b00a1fbd3d8815e58 SHA512 aac43448330852b692f8ca1d51777db9b966fffaff9e61decbadb9646e2727cbe458427fa9503aee2fbf597ed72ebb89a0b4e2585471bf4c52bb4b5a1ef41962 WHIRLPOOL 073a6362c9f90f32dc5c12a4da204dcf4472fa1cf41b4b0b4830eb344cda0edf48d352fc2a138b9c3c846e1fe6306086aa41db4ade4461600f6971b185cf41f0
+DIST ruby-beautify-0.97.4.gem 15360 SHA256 04b7ae72a79160b72e532860764344ddf62e97cd3d564a8675c22c10f0ad5add SHA512 0ce3403587f12036387e5556632e5f2bf57066949fe401699d6de256d26a91d2dc8f7e007ce4514a7672ad0896cd1c498b5a35965640dadfa7383915b12989f3 WHIRLPOOL eb97c18e1cdace13fdf7c56470df9fa399b3a4ba6113c1b12335ac2d3c6977e58bb233693d46ec5b5cff03ad42c15cf811e1f429e7463db9cc27f249d4a5068c
diff --git a/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild b/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild
new file mode 100644
index 000000000000..fb51c070f228
--- /dev/null
+++ b/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild
@@ -0,0 +1,34 @@
+# 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="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="README.md WHATSNEW.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a cli tool (and module) to beautify ruby code"
+HOMEPAGE="https://github.com/erniebrodeur/ruby-beautify"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/codeclimate/I s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_prepare() {
+	# Needed for specs
+	mkdir tmp || die
+
+	# Use correct ruby interpreter to test and avoid bundler. Handle
+	# directory changes.
+	sed -i -e 's|bundle exec|'${RUBY}' -Ilib:../lib -S|' spec/bin/ruby-beautify_spec.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
new file mode 100644
index 000000000000..a5698eb7b768
--- /dev/null
+++ b/dev-ruby/sass-rails/sass-rails-5.0.4-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
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
+HOMEPAGE="https://github.com/rails/sass-rails"
+SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+
+IUSE=""
+
+# Restrict tests for now since it is hard to set up the right
+# environment with the correct ruby interpreter and Rails test
+# application.
+RESTRICT="test"
+
+#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
+
+ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
+	=dev-ruby/railties-4*:*
+	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
+	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
+	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/spring/spring-1.6.1.ebuild b/dev-ruby/spring/spring-1.6.1.ebuild
index 3ff24c8a65b8..dfb5fc5c98d2 100644
--- a/dev-ruby/spring/spring-1.6.1.ebuild
+++ b/dev-ruby/spring/spring-1.6.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
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
new file mode 100644
index 000000000000..4186903d579a
--- /dev/null
+++ b/dev-ruby/sprockets-rails/sprockets-rails-2.3.3-r1.ebuild
@@ -0,0 +1,34 @@
+# 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_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline"
+HOMEPAGE="https://github.com/rails/sprockets-rails"
+SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-3.0:*
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/actionpack-4
+		>=dev-ruby/railties-4
+		dev-ruby/test-unit:2
+	)"
diff --git a/dev-ruby/sprockets/sprockets-3.4.1.ebuild b/dev-ruby/sprockets/sprockets-3.4.1.ebuild
index 6f0b2807c260..caa0819808c6 100644
--- a/dev-ruby/sprockets/sprockets-3.4.1.ebuild
+++ b/dev-ruby/sprockets/sprockets-3.4.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
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/spy/spy-0.4.2.ebuild b/dev-ruby/spy/spy-0.4.2.ebuild
index 5381a0e98099..e0aa0ba0d270 100644
--- a/dev-ruby/spy/spy-0.4.2.ebuild
+++ b/dev-ruby/spy/spy-0.4.2.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_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index b11840473ee2..08e75a0b4056 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -3,3 +3,4 @@ DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb
 DIST test-unit-3.1.3.gem 121856 SHA256 b34ed36148329b1f4df9b3385259172c5435457f0da3d5494e3fcd0ae1f33d79 SHA512 3b2ab5e74940c9e02ca345212858ace4fec2266137da896efed50d87f53fb6076be11dcc05603b294bfe48a68ac2458c2b6bd437ddcf45ea7b0b1959b3c7fb89 WHIRLPOOL baba9eba099c6a599c8237dccef9749075b32a187041080c5230ad36f9354f175d9c96d7d2a02f7fcc4b18bb21cf628f0e3f06bc530914fd68cd4565e6a369ab
 DIST test-unit-3.1.4.gem 122368 SHA256 9af970e9106b57672cccf917af6bc252e18ceef500d026eac360559f4560c4af SHA512 9e7b3d1a83b5d296d082281cf0f177ce6ab4347351cb358c199924bfc6bc2c56ed2c9a0701aac7dc056bede29087b91389a3e51c04e7f31852bfa6d90bac6b16 WHIRLPOOL 84911bbf8427d7575456257f4ac0f2fe6cb1862a4c9e68507e185529a65c4cca6fc1980b795a813bd886c3c7a4d389ca2435393539a13eb447d4515b45e72410
 DIST test-unit-3.1.5.gem 122368 SHA256 9c38357eb0342e7971b6e6c37691b1ceb5161736a0e92e314797e6cabfb4bf4b SHA512 46840108402ef6319e76fd9b5270e88aaf45d6cf99fa84f28e8a01ce2bc2d5e0e79d1fdf660807fcc5b2434540f4240bd4799ecbb7fa6231af1cd96a7c89f994 WHIRLPOOL fbec655035463fd0b10f4c514444c2448feb37dd4f072ad536fc3f834afd5f9059409da87b23f4c7b7d73f7150815b26a91cdb80a9365211d2280a5ec102b97b
+DIST test-unit-3.1.7.gem 124416 SHA256 01133018f929db5290471b8e39feb5317bde2488efde1ec18e9653b2edb526f1 SHA512 fb41fdc27b0278fd272db100d76b4691468ab68d1327baf63d4e230285aec5e9faedb3b2fced4445a8a801828e9c715533ab6311dbe7a4033b6c8402e711b06e WHIRLPOOL 4d660d4c4da7329daa5ea1d4f5ac1859d150c0cfea8591adc82a5ad2ef1c08095cc29a8ef269d0f989ded7de20c903068ac1733a95c0cf7d1912887c003dd0c6
diff --git a/dev-ruby/test-unit/test-unit-3.1.7.ebuild b/dev-ruby/test-unit/test-unit-3.1.7.ebuild
new file mode 100644
index 000000000000..073ce3189d49
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.1.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
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+inherit ruby-fakegem
+
+# Assume for now that ruby23 is not eselected yet and only
+# depend on yard for the other ruby implementations. Without this
+# assumption bootstrapping ruby23 won't be possible due to the yard
+# dependency tree.
+USE_RUBY="${USE_RUBY/ruby23/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		yard doc --title ${PN} || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.5.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.5.ebuild
index a14a5d3885d6..9a2cad2b6b7b 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.5.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.2.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.2.ebuild
index 6f73e204bec2..fdd639c12989 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.2.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/zentest/zentest-4.11.0.ebuild b/dev-ruby/zentest/zentest-4.11.0.ebuild
index a23ddd57ad31..4f2b1fdbc7f1 100644
--- a/dev-ruby/zentest/zentest-4.11.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.0.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="ZenTest provides tools to support testing: zentest, unit_diff, auto
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
index 1a84cc09b109..af9e7858c481 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~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
index 3691bb94f5bc..cd33e8d8d139 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc 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/ppower4/ppower4-0.9.6.ebuild b/dev-tex/ppower4/ppower4-0.9.6.ebuild
index fe66458205d9..8ac1ba25b43e 100644
--- a/dev-tex/ppower4/ppower4-0.9.6.ebuild
+++ b/dev-tex/ppower4/ppower4-0.9.6.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$
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.tex.ac.uk/tex-archive/support/ppower4/index.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 x86"
 
 IUSE=""
 DEPEND="app-arch/unzip"
diff --git a/dev-util/antlrworks/antlrworks-1.2.3.ebuild b/dev-util/antlrworks/antlrworks-1.2.3.ebuild
index 6b84261a6c4c..8ea416e55aa0 100644
--- a/dev-util/antlrworks/antlrworks-1.2.3.ebuild
+++ b/dev-util/antlrworks/antlrworks-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 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="http://www.antlr.org/download/${P}-src.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild
index ecea86cac794..16444c230fb8 100644
--- a/dev-util/argouml/argouml-0.34.ebuild
+++ b/dev-util/argouml/argouml-0.34.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$
 
@@ -18,7 +18,7 @@ SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-util/bnfc/bnfc-2.8.ebuild b/dev-util/bnfc/bnfc-2.8.ebuild
index 16e448789a28..08c4ba52a9bb 100644
--- a/dev-util/bnfc/bnfc-2.8.ebuild
+++ b/dev-util/bnfc/bnfc-2.8.ebuild
@@ -38,3 +38,7 @@ DEPEND="${RDEPEND}
 "
 
 S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
+}
diff --git a/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch b/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
new file mode 100644
index 000000000000..e9834830e257
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
@@ -0,0 +1,8 @@
+diff --git a/src/LexBNF.x b/src/LexBNF.x
+index 927e15d..aea3386 100644
+--- a/src/LexBNF.x
++++ b/src/LexBNF.x
+@@ -11,2 +11,3 @@ import qualified Data.Bits
+ import Data.Word (Word8)
++import Data.Char (ord)
+ }
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 05be4cc14a91..b5696be8ce5e 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -4,3 +4,4 @@ DIST bustle-0.4.3.tar.gz 96970 SHA256 255e035a8b494f7edd21e657c246be00da1452faa2
 DIST bustle-0.4.7.tar.gz 114231 SHA256 08b12207561157e639bc64e0b274e70e4909f50079cd97564c916d66a3f088b9 SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd WHIRLPOOL 8f6a80b881b9c13498351e2dc4910406dc151db9c320b8fba291c9577b41eede58003b943de13bf637d28226e7301e4dfdc8f2b6a0fa4fda2792962505fd0153
 DIST bustle-0.5.1.tar.gz 118974 SHA256 06601c919d69bea28b116f6447f5557ce46a3e4c4b6b4b75bb65dc2579ff48d6 SHA512 8e77cd82253ba935f4f7b1edae5ba7a99c65cbee2ce6e7d8df48f3182ee5dac92c9b3bc9826a04555de605fa4577c51d9fd027d9e1b92e8a8cf149c466c04e8f WHIRLPOOL f77ca6da883d1b296c049ec67119e3fdf6114a48bd5c2432059b01c80e9e68ef9d0dc9ecd45510e8d4b37620337718bc75e67bc6ac326de9a5302d03d9a2eb22
 DIST bustle-0.5.2.tar.gz 122249 SHA256 659d75f91d2d08447bce484a8176f6a2cc94cc10a2d732b7e733e4312a527e90 SHA512 a5e14dcf6b39ceb16c0d8b4182b1c49858f3a076edcb30fb4b1c41c3e994b595f89f130527243441ff3fc7b08a8e9dfd6587efc7db74b85c385c0a94d544553d WHIRLPOOL c1f9f128d34da2e1a47293a7276d1501ebb464b7bb7af2610e9b299f78b2cd73deedf45200f27c252891df25b4b41d1779e85dc794a9ccffd1c9d1d2271d0e88
+DIST bustle-0.5.3.tar.gz 122624 SHA256 9e525611cfb0c0715969b0ea77c2f63aaf7bc6ad70c9cf889a1655b66c0c24fd SHA512 abdc56d57da1165d2e805abe8f1e278a8df3b73510b2420f89eaa8511b74db1dd071529ae2eadc5cd5679d9dd81df1e632603f191f03e42c74f1d3629814ad94 WHIRLPOOL 65cbd7ff001327377eea907ddb31693e3fb79a7d247e01120df40c41436f9735a66702f206e34f8fca5f75a8560ca000bfdf78901b52f92856122196bb0d9d76
diff --git a/dev-util/bustle/bustle-0.5.3.ebuild b/dev-util/bustle/bustle-0.5.3.ebuild
new file mode 100644
index 000000000000..8be9e2d307da
--- /dev/null
+++ b/dev-util/bustle/bustle-0.5.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="interactivetests +threaded"
+
+RDEPEND="dev-haskell/cairo:=
+	>=dev-haskell/dbus-0.10:=
+	dev-haskell/gio:=
+	dev-haskell/glib:=
+	>=dev-haskell/gtk3-0.13.7:0=
+	>=dev-haskell/hgettext-0.1.5:=
+	dev-haskell/mtl:=
+	dev-haskell/pango:=
+	dev-haskell/parsec:=
+	dev-haskell/pcap:=
+	dev-haskell/setlocale:=
+	dev-haskell/text:=
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	virtual/pkgconfig
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag interactivetests interactivetests) \
+		$(cabal_flag threaded threaded)
+}
+
+src_compile() {
+	# compile haskell part
+	cabal_src_compile || die "could not build haskell parts"
+
+	# compile C part
+	emake \
+		"CC=$(tc-getCC)" \
+		"CFLAGS=${CFLAGS}" \
+		"CPPFLAGS=${CPPFLAGS}" \
+		"LDFLAGS=${LDFLAGS}"
+}
+
+src_install() {
+	# install haskell part
+	cabal_src_install || die "could not install haskell parts"
+
+	dobin "${S}"/dist/build/bustle-pcap
+	doman bustle-pcap.1
+	dodoc README.md HACKING.md NEWS.md
+}
diff --git a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index 23c5a2362cbb..abf2bf85be77 100644
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-util/cmake/cmake-3.4.1.ebuild b/dev-util/cmake/cmake-3.4.1.ebuild
index bf3ff3840222..90aced83be73 100644
--- a/dev-util/cmake/cmake-3.4.1.ebuild
+++ b/dev-util/cmake/cmake-3.4.1.ebuild
@@ -186,7 +186,7 @@ src_install() {
 
 	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
 
-	rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+	rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
 }
 
 pkg_postinst() {
diff --git a/dev-util/debootstrap/debootstrap-1.0.75.ebuild b/dev-util/debootstrap/debootstrap-1.0.75.ebuild
index efe2c538b877..59a9926f7dae 100644
--- a/dev-util/debootstrap/debootstrap-1.0.75.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.75.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild b/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
index b2dd5f5739cc..9a0592bac24e 100644
--- a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
+++ b/dev-util/deskzilla/deskzilla-1.7.1-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$
 
@@ -19,7 +19,7 @@ LICENSE="ALMWorks-1.2"
 # distfiles...
 RESTRICT="mirror"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/jarwizard/jarwizard-2.50.ebuild b/dev-util/jarwizard/jarwizard-2.50.ebuild
index 73df40ea5701..29e23bc25f2d 100644
--- a/dev-util/jarwizard/jarwizard-2.50.ebuild
+++ b/dev-util/jarwizard/jarwizard-2.50.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$
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/jarwizard/${PN}_${PV/./}_src.zip"
 HOMEPAGE="http://sourceforge.net/projects/jarwizard/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 x86"
 DEPEND=">=virtual/jdk-1.5
 		app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-util/jconfig/jconfig-2.8-r3.ebuild b/dev-util/jconfig/jconfig-2.8-r3.ebuild
index dd099beb8d05..5fbf34483049 100644
--- a/dev-util/jconfig/jconfig-2.8-r3.ebuild
+++ b/dev-util/jconfig/jconfig-2.8-r3.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$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="java-virtuals/jmx"
diff --git a/dev-util/jconfig/jconfig-2.8.5.ebuild b/dev-util/jconfig/jconfig-2.8.5.ebuild
index 84a5a0a4277c..5fbf34483049 100644
--- a/dev-util/jconfig/jconfig-2.8.5.ebuild
+++ b/dev-util/jconfig/jconfig-2.8.5.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$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="java-virtuals/jmx"
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
index 6d831fb7a88f..9239eac455e2 100644
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ b/dev-util/jconfig/jconfig-2.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="java-virtuals/jmx"
diff --git a/dev-util/pmd/pmd-4.2.5.ebuild b/dev-util/pmd/pmd-4.2.5.ebuild
index b188b81f31db..53712ef7ac4e 100644
--- a/dev-util/pmd/pmd-4.2.5.ebuild
+++ b/dev-util/pmd/pmd-4.2.5.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
 
 LICENSE="pmd"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..baca3debd412
--- /dev/null
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.5-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
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A tool for testing command-line programs"
+HOMEPAGE="http://joyful.com/shelltestrunner"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
+	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
+	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
+	dev-haskell/hunit:=
+	<dev-haskell/parsec-3.2:=
+	>=dev-haskell/pretty-show-1.6.5:=
+	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
+	dev-haskell/safe:=
+	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
+	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
+	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'HUnit                            < 1.3' 'HUnit'
+}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 938916be5fe9..9c7bc3e3c171 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -2,3 +2,4 @@ DIST sysdig-0.1.104.tar.gz 459784 SHA256 05a7ed95a1b73053cae0a77de199e84d7c98040
 DIST sysdig-0.1.92.tar.xz 244728 SHA256 794ae6cef6ab8dae029979f5985b72c15f209e927518a3881e8a7624d77d5132 SHA512 661af8eece353ba0b0ea518496da89f4525f767c2797ff9f9e5caf670b6b3e7fa0c5cb14c3852971f563b665b42105a143d458a041b270d7107a403b2ec98b11 WHIRLPOOL bb47d717bcb3c5c948f4344a56e45996cfe275a48ea19f0fa12c2fce91f81fad317c9b5c05812e9c2aaf02240b597fb85f60a5ad3ee391a1a825de62a7eab57c
 DIST sysdig-0.1.98.tar.xz 263328 SHA256 5d60896ad2997f3dcf5d7252a53f5f7808ded11bd7c63f3a8c2aaaa1421f018f SHA512 8e4ab622fd0d69567e63054df256bfddda5765e2cf4d89490cd871625e4bb16d3d25ecbf0965f00e312d03ef3044615a7fd94d2f704b1a833ae1da9e2f66f33a WHIRLPOOL a96f8e8635d03351e4f42e8b3959c890a63a1232df5c9cc03f9359e18a926e23561e4f4fb10986285ff757e3ee47305a7fde01905541984e5582ba740962db70
 DIST sysdig-0.5.1.tar.gz 505015 SHA256 dad586680f1615a769143d54a9ed19753dc0a4be164c680cc14dd2910a989623 SHA512 87fd22ef8d9c54b609d6e7a01f388b677159034ed462ec62c51d11ac8af6f2af872eed7274f6a04c5a4c47f8ba88844596524762ddcd017da05943ca7d1d773f WHIRLPOOL 4679453c6e45c70a06a923f75e1093c304a3a650601e67215564b3b5c211736d6484773c2f0dad76f6d0e2dbd47d645d77adaf71a5d8f12a0ac999bf11e726bf
+DIST sysdig-0.6.0.tar.gz 511512 SHA256 e30da5c5385503164e2198f5a126aa9ffd212efd00e192c89aa7dd97b4ac491c SHA512 2af30c5d487d0386554e6f74c5ef66df201b4c3f0b1ce9dc0002c193213359e549ab4f216e1cec41c7f36ac3aeeefa928821795b28f012f7786d35993e09691e WHIRLPOOL b760bbd7e489e97ce67c1448ba02d0755522a25c64e32e2d12ecb3e34aa40b107bf707fff1202da4df19c7dc79dc3ff5c35b23961e6ec8d42aa5a92c115a4098
diff --git a/dev-util/sysdig/sysdig-0.6.0.ebuild b/dev-util/sysdig/sysdig-0.6.0.ebuild
new file mode 100644
index 000000000000..ac347bf9f921
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.6.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# cmake generates make-specific code
+#: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="http://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules"
+
+RDEPEND="
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	dev-libs/openssl:0=
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	use modules && linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	use modules && linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="driver"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use modules && linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED%/}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED%/}"/usr/etc || die
+}
diff --git a/dev-util/weka/weka-3.6.12-r1.ebuild b/dev-util/weka/weka-3.6.12-r1.ebuild
index d9ad743aef0a..c41acfe0180b 100644
--- a/dev-util/weka/weka-3.6.12-r1.ebuild
+++ b/dev-util/weka/weka-3.6.12-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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip
 	>=dev-java/javacup-0.11a_beta20060608:0"
diff --git a/dev-util/weka/weka-3.6.6-r1.ebuild b/dev-util/weka/weka-3.6.6-r1.ebuild
index f0621ba35a83..1e5cd709a353 100644
--- a/dev-util/weka/weka-3.6.6-r1.ebuild
+++ b/dev-util/weka/weka-3.6.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	>=dev-java/javacup-0.11a_beta20060608:0"
diff --git a/dev-util/weka/weka-3.6.6-r2.ebuild b/dev-util/weka/weka-3.6.6-r2.ebuild
index f9aad58cba7b..f005640c9ab7 100644
--- a/dev-util/weka/weka-3.6.6-r2.ebuild
+++ b/dev-util/weka/weka-3.6.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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	>=dev-java/javacup-0.11a_beta20060608:0"
diff --git a/dev-vcs/blogc-git-receiver/Manifest b/dev-vcs/blogc-git-receiver/Manifest
index b66957a99e0e..3f672a229fc7 100644
--- a/dev-vcs/blogc-git-receiver/Manifest
+++ b/dev-vcs/blogc-git-receiver/Manifest
@@ -1 +1 @@
-DIST blogc-git-receiver-0.2.tar.xz 68992 SHA256 ec21022a0e123dfb679492ad2ccd0787ba5ba499a9ad8ec7e6dd9fbc75837b3f SHA512 4f05f6b8c4e5053764fa2faab5f727844d03aa0bad106f974c60e38788a2691fc056849cc649a7dbbeff44ddd0e853406d5e5a520d0d44b62e7e67a754e8c371 WHIRLPOOL b6b3e60bb9ed67b53efa10df19db1223ecd21f61e7cfcd0e50344b55ed01ab102073b31ee00bdc9be239c21a479285ed4bb2a0e4109ef106414a5df947cf6925
+DIST blogc-git-receiver-0.3.tar.xz 69644 SHA256 29927afc6900ec781d9d0455d4ca79bdd59a320e023ffdad9705d4b4d8017990 SHA512 d12e03f5bde55baf946c788790e35f355d53638cdae0ba08b4099cbf861bc0bb5c7c8a8a5f02ebd670c581e220d33074e6bbe4db76f86189d0a493e1b4313325 WHIRLPOOL d135de4df71a34ca6fb98dc778ba0a9526152a08884c8b6e2bb1412f8646a616634576b24c603d919d6123220eb9099072d6a9a42c71b3a7c125d739eea9bab3
diff --git a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.2.ebuild b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.3.ebuild
index 5b79d3045865..5b79d3045865 100644
--- a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.2.ebuild
+++ b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.3.ebuild
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
new file mode 100644
index 000000000000..0ce706db99a6
--- /dev/null
+++ b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
@@ -0,0 +1,46 @@
+Searching for pages using the MediaWiki API returns at most 500 results
+(hi Patrick). To get a list of all pages in a larger wiki, we need to run
+repeated searches...
+
+Source: https://github.com/moy/Git-Mediawiki/issues/32
+Author: anarcat https://github.com/anarcat
+
+diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
+index 8dd74a9..f2ce311 100755
+--- a/contrib/mw-to-git/git-remote-mediawiki.perl
++++ b/contrib/mw-to-git/git-remote-mediawiki.perl
+@@ -259,16 +259,29 @@ sub get_mw_tracked_categories {
+ sub get_mw_all_pages {
+ 	my $pages = shift;
+ 	# No user-provided list, get the list of pages from the API.
+-	my $mw_pages = $mediawiki->list({
++	my $query = {
+ 		action => 'query',
+ 		list => 'allpages',
+ 		aplimit => 'max'
+-	});
+-	if (!defined($mw_pages)) {
++	};
++	my $curpage;
++	my $oldpage = '';
++	while (1) {
++	if (defined($curpage)) {
++		if ($oldpage eq $curpage) {
++		    last;
++		}
++		$query->{apfrom} = $curpage;
++		$oldpage = $curpage;
++	    }
++	    my $mw_pages = $mediawiki->list($query);
++	    if (!defined($mw_pages)) {
+ 		fatal_mw_error("get the list of wiki pages");
+-	}
+-	foreach my $page (@{$mw_pages}) {
++	    }
++	    foreach my $page (@{$mw_pages}) {
+ 		$pages->{$page->{title}} = $page;
++		$curpage = $page->{title};
++	    }
+ 	}
+ 	return;
+ }
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
new file mode 100644
index 000000000000..72ab2126fa9c
--- /dev/null
+++ b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
@@ -0,0 +1,97 @@
+source:
+https://gist.github.com/anarcat/f821fa285c6b8b6b16a5
+https://github.com/moy/Git-Mediawiki/issues/10
+
+
+From 147224cfe6143c44b16aec0bb6d6a506a6b96ced Mon Sep 17 00:00:00 2001
+From: Kevin <kevin@ki-ai.org>
+Date: Fri, 28 Aug 2015 15:53:37 -0500
+Subject: [PATCH] Add namespace support to git-mediawiki
+
+Signed-off-by: Kevin <kevin@ki-ai.org>
+---
+ contrib/mw-to-git/git-remote-mediawiki.perl | 34 +++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
+index 8dd74a9..662a5b5 100755
+--- a/contrib/mw-to-git/git-remote-mediawiki.perl
++++ b/contrib/mw-to-git/git-remote-mediawiki.perl
+@@ -17,6 +17,7 @@ use Git;
+ use Git::Mediawiki qw(clean_filename smudge_filename connect_maybe
+ 					EMPTY HTTP_CODE_OK);
+ use DateTime::Format::ISO8601;
++use Scalar::Util;
+ use warnings;
+ 
+ # By default, use UTF-8 to communicate with Git and the user
+@@ -63,6 +64,10 @@ chomp(@tracked_pages);
+ my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
+ chomp(@tracked_categories);
+ 
++# Just like @tracked_categories, but for MediaWiki namespaces.
++my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
++chomp(@tracked_namespaces);
++
+ # Import media files on pull
+ my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
+ chomp($import_media);
+@@ -256,6 +261,23 @@ sub get_mw_tracked_categories {
+ 	return;
+ }
+ 
++sub get_mw_tracked_namespaces {
++    my $pages = shift;
++    foreach my $local_namespace (@tracked_namespaces) {
++        my $mw_pages = $mediawiki->list( {
++            action => 'query',
++            list => 'allpages',
++            apnamespace => get_mw_namespace_id($local_namespace),
++            aplimit => 'max' } )
++            || die $mediawiki->{error}->{code} . ': '
++                . $mediawiki->{error}->{details} . "\n";
++        foreach my $page (@{$mw_pages}) {
++            $pages->{$page->{title}} = $page;
++        }
++    }
++    return;
++}
++
+ sub get_mw_all_pages {
+ 	my $pages = shift;
+ 	# No user-provided list, get the list of pages from the API.
+@@ -319,6 +341,10 @@ sub get_mw_pages {
+ 		$user_defined = 1;
+ 		get_mw_tracked_categories(\%pages);
+ 	}
++    if (@tracked_namespaces) {
++        $user_defined = 1;
++        get_mw_tracked_namespaces(\%pages);
++    }
+ 	if (!$user_defined) {
+ 		get_mw_all_pages(\%pages);
+ 	}
+@@ -1263,7 +1289,6 @@ my %cached_mw_namespace_id;
+ sub get_mw_namespace_id {
+ 	$mediawiki = connect_maybe($mediawiki, $remotename, $url);
+ 	my $name = shift;
+-
+ 	if (!exists $namespace_id{$name}) {
+ 		# Look at configuration file, if the record for that namespace is
+ 		# already cached. Namespaces are stored in form:
+@@ -1331,7 +1356,12 @@ sub get_mw_namespace_id {
+ sub get_mw_namespace_id_for_page {
+ 	my $namespace = shift;
+ 	if ($namespace =~ /^([^:]*):/) {
+-		return get_mw_namespace_id($namespace);
++		my ($ns, $id) = split(/:/, $namespace);
++		if (Scalar::Util::looks_like_number($id)) {
++			return get_mw_namespace_id($ns);
++		} else{
++			return
++		}
+ 	} else {
+ 		return;
+ 	}
+-- 
+2.5.0
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
new file mode 100644
index 000000000000..c798a894d3f8
--- /dev/null
+++ b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
@@ -0,0 +1,48 @@
+From 2593304723c6def159c10b9060dafa78a775a057 Mon Sep 17 00:00:00 2001
+From: Lyubomyr Shaydariv <lyubomyr-shaydariv@users.noreply.github.com>
+Date: Fri, 11 Sep 2015 00:41:17 +0300
+Subject: [PATCH] git-remote-mediawiki: support subpages as subdirectories
+
+This is a fix for https://github.com/moy/Git-Mediawiki/issues/22
+The subdirectories option is enabled using -c remote.origin.subpageDirs=true
+during the cloning and it is not recommended to be modified in or
+removed from .git/config after the cloning.
+---
+ contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
+index 8dd74a9..f3624be 100755
+--- a/contrib/mw-to-git/git-remote-mediawiki.perl
++++ b/contrib/mw-to-git/git-remote-mediawiki.perl
+@@ -63,6 +63,11 @@
+ my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
+ chomp(@tracked_categories);
+ 
++# Use subdirectories for subpages
++my $use_subpage_dirs = run_git("config --get --bool remote.${remotename}.subpageDirs");
++chomp($use_subpage_dirs);
++$use_subpage_dirs = ($use_subpage_dirs eq 'true');
++
+ # Import media files on pull
+ my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
+ chomp($import_media);
+@@ -689,6 +694,9 @@ sub fe_escape_path {
+     $path =~ s/\\/\\\\/g;
+     $path =~ s/"/\\"/g;
+     $path =~ s/\n/\\n/g;
++    if ($use_subpage_dirs) {
++        $path =~ s/%2F/\//g;
++    }
+     return qq("${path}");
+ }
+ 
+@@ -927,7 +935,7 @@ sub mw_import_revids {
+ 		# If this is a revision of the media page for new version
+ 		# of a file do one common commit for both file and media page.
+ 		# Else do commit only for that page.
+-		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of $commit{title}\n";
++		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of ", fe_escape_path($commit{title}), "\n";
+ 		import_file_revision(\%commit, ($fetch_from == 1), $n_actual, \%mediafile);
+ 	}
+ 
diff --git a/dev-vcs/git/git-2.7.0-r2.ebuild b/dev-vcs/git/git-2.7.0-r2.ebuild
new file mode 100644
index 000000000000..a8c159be8fe4
--- /dev/null
+++ b/dev-vcs/git/git-2.7.0-r2.ebuild
@@ -0,0 +1,650 @@
+# 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-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 460140c73abb..cceeaee798cf 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-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$
 
@@ -38,7 +38,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -102,6 +102,7 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
@@ -228,6 +229,14 @@ src_prepare() {
 	# 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
 
 	epatch_user
@@ -630,6 +639,7 @@ pkg_postinst() {
 	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() {
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 71727688b49b..992280ba97a4 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-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$
 
@@ -38,7 +38,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -102,6 +102,7 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
@@ -228,6 +229,14 @@ src_prepare() {
 	# 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}"/${PN}-2.2.0-svn-fe-linking.patch
 
 	epatch_user
@@ -630,6 +639,7 @@ pkg_postinst() {
 	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() {
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index a9feb918ee25..3aea20c47601 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-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$
 
@@ -38,7 +38,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+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="
@@ -103,6 +103,7 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
@@ -231,6 +232,14 @@ src_prepare() {
 	# 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
 
 	epatch_user
@@ -633,6 +642,7 @@ pkg_postinst() {
 	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() {
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 7a5cc559f4e0..d3344ac4e72a 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-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$
 
@@ -38,7 +38,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -102,6 +102,7 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
@@ -228,6 +229,14 @@ src_prepare() {
 	# 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}"/${PN}-2.2.0-svn-fe-linking.patch
 
 	epatch_user
@@ -630,6 +639,7 @@ pkg_postinst() {
 	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() {
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index dc1473f88185..f80c7dd5647d 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -31,6 +31,7 @@
     <flag name="gtk">Include the gitview contrib tool</flag>
     <flag name="highlight">GitWeb support for app-text/highlight</flag>
     <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
+    <flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
     <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
     <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
     <flag name="tk">Include the 'gitk' and 'git gui' tools</flag>
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index dbb8835a49b2..56a2b8149750 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,3 +1,4 @@
 DIST hg-git-0.7.0.tar.gz 42956 SHA256 9db9cd87b9b173c192b29336b4029122a4fe2858c369dc8c5a59228515bc61a9 SHA512 732dbd12184a5346310b6d14bb0b24c2255ff607ef54d064387b7cadd64aa84dd2d6909e6dde36f9fa8ac8131c1adc315c2bae2e068066864c086b239524d5d4 WHIRLPOOL 0c8216da9fdaebc2fcb56d7bec12e9a087570cf032d253e77833cbf8f31a2d581d85b820c51e37cd519ce720bd49fec5be27211b58b64fb9c18b1fff1c24d26e
 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
diff --git a/dev-vcs/hg-git/hg-git-0.8.4.ebuild b/dev-vcs/hg-git/hg-git-0.8.4.ebuild
new file mode 100644
index 000000000000..55574ccc9689
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.4.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/hgview/Manifest b/dev-vcs/hgview/Manifest
index 6dc0435f0e6b..8c7ff2385e58 100644
--- a/dev-vcs/hgview/Manifest
+++ b/dev-vcs/hgview/Manifest
@@ -1,4 +1,2 @@
-DIST hgview-1.7.1.tar.gz 307250 SHA256 633862c3a2313e5f2432f19b9da9fa19a1ca8f2f2cd0b86df019832e86afc001 SHA512 ddd6645160a5660515d0dbf46af7d600cd9b1588393142f536f04889e75f4740af2b3196c879993138735ed4d2c16c2b71d3ef8997e50ae41e01c83b5b6f441a WHIRLPOOL 851d7e211153f070f3dbf0d86269cef5efbac002441768a8b73911237c99ce01b2dcfb26e5d31a726d52dd764769cbeeeaa915dacf8425c2a8251b8bb3f5bf47
-DIST hgview-1.8.0.tar.gz 177390 SHA256 21cbead835113cc307c2f9982805ba6621513260c44d3102d05f1a903ec4caec SHA512 8c432517d17253def8f2aefc5d5b2d7b7b4f422bf0f97d3a53501d9a3e1e023f6bf76a100d95479f93a0dcaa6816364a56a12e07467dfcb1a205b151d8115c47 WHIRLPOOL c8cb26d73be17cd43e9f07e222b3b41680d09b7f077519f50e076be17d98b450b445089c33f59fd3703c9a245de8e64756f745c8bda22418445a940bd933d15b
-DIST hgview-1.8.1.tar.gz 177648 SHA256 8a24899f050a8f6dba8d4b3d3bc31532e375b1a8e6012a9baaaf2a48a188f72c SHA512 2d7431acf15519a0ea87ae338bc1bb70f88cc456dec424aab0e7a5c258e8e8617133366fd7ad05a3ca4d740261f245757494f95de75e0a1fb1f756cf9728aa25 WHIRLPOOL d7dad115b5aa83ac3115e3f05154bd509f96a886ebbad0d01bbb0072bb22ea4ef84b76f4aa51514e17a3a2cd49814479045b1d1c76d0a2b8a2caa5fe1d96e115
 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.7.1-r1.ebuild b/dev-vcs/hgview/hgview-1.7.1-r1.ebuild
deleted file mode 100644
index 3f827434180d..000000000000
--- a/dev-vcs/hgview/hgview-1.7.1-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$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="PyQt4-based Mercurial log navigator"
-HOMEPAGE="http://www.logilab.org/project/hgview"
-SRC_URI="http://ftp.logilab.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP},X]
-	dev-python/qscintilla-python[${PYTHON_USEDEP}]
-	dev-vcs/mercurial[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-python_configure_all() {
-	mydistutilsargs=(
-		build $(use doc || echo --no-doc)
-	)
-}
-
-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/dev-vcs/hgview/hgview-1.8.1.ebuild b/dev-vcs/hgview/hgview-1.8.1.ebuild
deleted file mode 100644
index 25ee8c32cabf..000000000000
--- a/dev-vcs/hgview/hgview-1.8.1.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/dev-vcs/hgview/hgview-1.8.0.ebuild b/dev-vcs/hgview/hgview-1.9.0.ebuild
index 25ee8c32cabf..7f380288c942 100644
--- a/dev-vcs/hgview/hgview-1.8.0.ebuild
+++ b/dev-vcs/hgview/hgview-1.9.0.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$
 
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index a913af29aead..25edb18a2e29 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -716,13 +716,15 @@ check_extra_config() {
 			ewarn "to absence of any configured kernel sources or compiled"
 			ewarn "config:"
 			for config in ${CONFIG_CHECK}; do
-				local_error="ERROR_${config#\~}"
+				config=${config#\~}
+				config=${config#\!}
+				local_error="ERROR_${config}"
 				msg="${!local_error}"
-				if [[ "x${msg}" == "x" ]]; then
-					local_error="WARNING_${config#\~}"
+				if [[ -z ${msg} ]]; then
+					local_error="WARNING_${config}"
 					msg="${!local_error}"
 				fi
-				ewarn " - ${config#\~}${msg:+ - }${msg}"
+				ewarn " - ${config}${msg:+ - }${msg}"
 			done
 			ewarn "You're on your own to make sure they are set if needed."
 			export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 6d704fb8f2af..23b0fa77b3d4 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -104,6 +104,7 @@ INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
 
 if is_crosscompile ; then
 	BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
+	HOSTLIBPATH=${PREFIX}/${CHOST}/${CTARGET}/lib/${GCC_CONFIG_VER}
 else
 	BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
 fi
@@ -1699,6 +1700,8 @@ toolchain_src_install() {
 
 	# Now do the fun stripping stuff
 	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
+	is_crosscompile && \
+		env RESTRICT="" CHOST=${CHOST} prepstrip "${D}/${HOSTLIBPATH}"
 	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
 	# gcc used to install helper binaries in lib/ but then moved to libexec/
 	[[ -d ${D}${PREFIX}/libexec/gcc ]] && \
@@ -1779,6 +1782,17 @@ gcc_movelibs() {
 	# older versions of gcc did not support --print-multi-os-directory
 	tc_version_is_at_least 3.2 || return 0
 
+	# For non-target libs which are for CHOST and not CTARGET, we want to
+	# move them to the compiler-specific CHOST internal dir.  This is stuff
+	# that you want to link against when building tools rather than building
+	# code to run on the target.
+	if tc_version_is_at_least 5 && is_crosscompile ; then
+		dodir "${HOSTLIBPATH}"
+		mv "${D}"/usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die
+	fi
+
+	# For all the libs that are built for CTARGET, move them into the
+	# compiler-specific CTARGET internal dir.
 	local x multiarg removedirs=""
 	for multiarg in $($(XGCC) -print-multi-lib) ; do
 		multiarg=${multiarg#*;}
diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
index 2c73e50cd9ef..3d5daf867ad1 100644
--- a/games-action/lugaru/Manifest
+++ b/games-action/lugaru/Manifest
@@ -1,2 +1 @@
 DIST lugaru-20151204.tar.bz2 88950866 SHA256 dae6a9e8ee70cc965a4299d2062725ce19dc9e4f1ba2a46c9205cb4e138be6b8 SHA512 8e448b782847376ac10585996a91a571fd005ac51e0e510765a35bf44bfcbb09e566d9a9c3d87277e69511b0f8d74c04edcc4b59f467bed640d8ba7c74045e30 WHIRLPOOL b2bcae57d8bfd13361c42c6d56fa285bc58fcd4bd6fb119931501db66005e5ece98487e413e41d1419c8f0408dc7507efa7f721db7df2b8d8a1572a65c28eb0e
-DIST lugaru-full-linux-x86-1.0c.bin 35539077 SHA256 fde77b630c15e94e7f9b28fead0baeb233901eb94dd0b8a898c27d3fcf22f040 SHA512 80bc94d2e3151972ac806d2ab381b10656aa7ed61e20a1cbe9f72be75532b39ef3dde67bd2f05328b8c675c4ea38d1b6ea606b06689abba708ef8ab53f595c19 WHIRLPOOL eed29393a37575cdc3ffeda6336b6de93185d825e6895f5a07bd92c02a900d1a14f9654f8fdbd36d4dd2994d70448a77df8d424cfbd8c11205139e582e5ac7d4
diff --git a/games-action/lugaru/lugaru-1.0c-r1.ebuild b/games-action/lugaru/lugaru-1.0c-r1.ebuild
deleted file mode 100644
index 42f5ac60df85..000000000000
--- a/games-action/lugaru/lugaru-1.0c-r1.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
-inherit eutils unpacker games
-
-DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
-HOMEPAGE="http://www.wolfire.com/lugaru"
-SRC_URI="${PN}-full-linux-x86-${PV}.bin"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? (
-		media-libs/libsdl[abi_x86_32(-)]
-		media-libs/openal[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	)
-	x86? (
-		media-libs/libsdl
-		media-libs/openal
-		x11-libs/libX11
-		x11-libs/libXext
-	)"
-
-S=${WORKDIR}/data
-
-src_unpack() {
-	# self unpacking zip archive; unzip warns about the exe stuff
-	unpack_zip ${A}
-
-	# Duplicate file and can't be handled by portage, bug #14983
-	rm -f "${S}/Data/Textures/Quit.png " || die
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/lugaru
-
-	insinto "${dir}"
-	doins -r Data
-
-	dodoc *.txt
-
-	exeinto "${dir}"
-	doexe ${PN}
-	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
-
-	doicon ${PN}.png
-	make_desktop_entry ${PN} Lugaru ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-board/cgoban2/cgoban2-2.6.12.ebuild b/games-board/cgoban2/cgoban2-2.6.12.ebuild
index 55aa2bc51abc..f562fd0ec663 100644
--- a/games-board/cgoban2/cgoban2-2.6.12.ebuild
+++ b/games-board/cgoban2/cgoban2-2.6.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$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/cgoban-unix-${PV}.tar.bz2"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.3"
diff --git a/games-board/megamek/megamek-0.34.10.ebuild b/games-board/megamek/megamek-0.34.10.ebuild
index a695a34a8db5..617afa771d15 100644
--- a/games-board/megamek/megamek-0.34.10.ebuild
+++ b/games-board/megamek/megamek-0.34.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$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/MegaMek-v${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 21e1c5511262..4be13826e37d 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,2 +1 @@
-DIST quakeforge-0.5.5.tar.bz2 1954072 SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a SHA512 0e81fbe2ef4fd1f491e2b46f222807eaa1b1dadf1e5200d3cd4609146050664a68c801c48418a3632a5ad0798ea9ec4eed70da03c2f90abb5fd1291adc95399c WHIRLPOOL 7442e2f2f8641b41cfbfb4206605faadc6f738bf9151c033ca8b39110428621b19e158ea185d4236069165738027a104dc939944bfb758021dbd85809276430c
 DIST quakeforge-0.7.2.tar.bz2 2887823 SHA256 1ddc8c963b23bd648d94af48062ab0448345761defeceaef7c62be55c4a28d7a SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55 WHIRLPOOL 11a4465435f42ba866806d4d4ede34a4a4e6b42b9e4fd6696c10e55bba4182762dc890ddff463bd9ad00b937d36dbde269886683f6f85b639a0ea6a30f5f6e4a
diff --git a/games-fps/quakeforge/files/0.5.5-ipv6.patch b/games-fps/quakeforge/files/0.5.5-ipv6.patch
deleted file mode 100644
index 96b92774dda7..000000000000
--- a/games-fps/quakeforge/files/0.5.5-ipv6.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/net/nc/net_udp6.c.orig	2004-05-16 04:21:18.334083592 -0400
-+++ libs/net/nc/net_udp6.c	2004-05-16 04:21:31.513080080 -0400
-@@ -123,6 +123,7 @@
- 
- netadr_t    net_from;
- netadr_t    net_local_adr;
-+netadr_t    net_loopback_adr;
- int         net_socket;
- 
- static sizebuf_t _net_message_message;
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch
deleted file mode 100644
index ed33e45343fc..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur quakeforge-0.5.5/libs/video/renderer/sw/Makefile.in quakeforge-0.5.5-modified/libs/video/renderer/sw/Makefile.in
---- quakeforge-0.5.5/libs/video/renderer/sw/Makefile.in	2004-05-02 16:52:12.000000000 -0400
-+++ quakeforge-0.5.5-modified/libs/video/renderer/sw/Makefile.in	2007-06-24 22:29:59.000000000 -0400
-@@ -403,8 +403,8 @@
- target_vendor = @target_vendor@
- vid_libs = @vid_libs@
- AUTOMAKE_OPTIONS = foreign
--AM_CFLAGS = @PREFER_NON_PIC@
--AM_CCASFLAGS = @PREFER_NON_PIC@
-+AM_CFLAGS = -fPIC
-+AM_CCASFLAGS = -fPIC
- INCLUDES = -I$(top_srcdir)/include
- @ASM_ARCH_FALSE@asm = 
- @ASM_ARCH_TRUE@asm = libasm.la
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc41.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-gcc41.patch
deleted file mode 100644
index a609c502ee50..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc41.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_file.c quakeforge-new/libs/audio/cd/cd_file.c
---- quakeforge-0.5.5/libs/audio/cd/cd_file.c	2004-02-07 21:39:44.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_file.c	2006-03-28 14:50:26.000000000 -0500
-@@ -84,7 +84,7 @@
- static int		  current_track;	// current track, used when pausing
- static plitem_t	 *tracklist = NULL;	// parsed tracklist, dictionary format
- 
--static cvar_t	 *bgmvolume;		// volume cvar
-+cvar_t	 *bgmvolume;		// volume cvar
- static cvar_t	 *mus_ogglist;	// tracklist cvar
- 
- 
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_linux.c quakeforge-new/libs/audio/cd/cd_linux.c
---- quakeforge-0.5.5/libs/audio/cd/cd_linux.c	2004-02-07 00:35:15.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_linux.c	2006-03-28 14:50:40.000000000 -0500
-@@ -79,7 +79,7 @@
- static int  cdfile = -1;
- 
- static cvar_t *mus_cddevice;
--static cvar_t *bgmvolume;
-+cvar_t *bgmvolume;
- 
- 
- static void
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_sdl.c quakeforge-new/libs/audio/cd/cd_sdl.c
---- quakeforge-0.5.5/libs/audio/cd/cd_sdl.c	2004-03-20 23:59:02.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_sdl.c	2006-03-28 14:50:52.000000000 -0500
-@@ -65,7 +65,7 @@
- static SDL_CD  *cd_id;
- static float	cdvolume = 1.0;
- 
--static cvar_t *bgmvolume;
-+	cvar_t *bgmvolume;
- 
- 
- static void
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_sgi.c quakeforge-new/libs/audio/cd/cd_sgi.c
---- quakeforge-0.5.5/libs/audio/cd/cd_sgi.c	2004-02-07 00:35:15.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_sgi.c	2006-03-28 14:51:01.000000000 -0500
-@@ -65,7 +65,7 @@
- static char cd_dev[] = "/dev/cdrom";
- 
- static CDPLAYER *cdp = NULL;
--static cvar_t *bgmvolume;
-+cvar_t *bgmvolume;
- 
- static void
- I_SGI_Eject (void)
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_win.c quakeforge-new/libs/audio/cd/cd_win.c
---- quakeforge-0.5.5/libs/audio/cd/cd_win.c	2004-02-07 00:35:15.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_win.c	2006-03-28 14:51:07.000000000 -0500
-@@ -68,7 +68,7 @@
- static void I_CDAudio_Play (int track, qboolean looping);
- static void I_CDAudio_Stop (void);
- 
--static cvar_t *bgmvolume;
-+cvar_t *bgmvolume;
- 
- 
- static void
-diff -burN quakeforge-0.5.5/libs/audio/renderer/snd_dma.c quakeforge-new/libs/audio/renderer/snd_dma.c
---- quakeforge-0.5.5/libs/audio/renderer/snd_dma.c	2004-03-01 06:51:01.000000000 -0500
-+++ quakeforge-new/libs/audio/renderer/snd_dma.c	2006-03-28 14:54:03.000000000 -0500
-@@ -72,17 +72,17 @@
- static channel_t *static_channels[MAX_CHANNELS];
- static int        num_statics;
- 
--static qboolean snd_initialized = false;
--static int      snd_blocked = 0;
-+qboolean snd_initialized = false;
-+int      snd_blocked = 0;
- static qboolean snd_ambient = 1;
- 
--static vec3_t   listener_origin;
--static vec3_t   listener_forward;
--static vec3_t   listener_right;
--static vec3_t   listener_up;
--static vec_t    sound_nominal_clip_dist = 1000.0;
-+vec3_t   listener_origin;
-+vec3_t   listener_forward;
-+vec3_t   listener_right;
-+vec3_t   listener_up;
-+vec_t    sound_nominal_clip_dist = 1000.0;
- 
--static unsigned soundtime;					// sample PAIRS
-+unsigned soundtime;					// sample PAIRS
- 
- #define	MAX_SFX		512
- static sfx_t   *known_sfx;					// hunk allocated [MAX_SFX]
-@@ -97,7 +97,7 @@
- static cvar_t  *ambient_level;
- static cvar_t  *nosound;
- static cvar_t  *precache;
--static cvar_t  *snd_mixahead;
-+cvar_t  *snd_mixahead;
- static cvar_t  *snd_noextraupdate;
- static cvar_t  *snd_phasesep;
- static cvar_t  *snd_show;
-@@ -122,7 +122,7 @@
- // isolating performance in the renderer.  The fakedma_updates is
- // number of times s_update() is called per second.
- 
--static qboolean	fakedma = false;
-+qboolean	fakedma = false;
- //static int      fakedma_updates = 15;
- 
- 
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_alsa.c quakeforge-new/libs/audio/targets/snd_alsa.c
---- quakeforge-0.5.5/libs/audio/targets/snd_alsa.c	2004-04-28 21:13:37.000000000 -0400
-+++ quakeforge-new/libs/audio/targets/snd_alsa.c	2006-03-28 14:52:01.000000000 -0500
-@@ -43,7 +43,7 @@
- #include "QF/sys.h"
- 
- static int			snd_inited;
--static int			snd_blocked = 0;
-+int			snd_blocked = 0;
- static volatile dma_t sn;
- static snd_pcm_uframes_t buffer_size;
- 
-@@ -59,10 +59,10 @@
- static snd_output_data_t  plugin_info_snd_output_data;
- static snd_output_funcs_t plugin_info_snd_output_funcs;
- 
--static cvar_t      *snd_bits;
--static cvar_t      *snd_device;
--static cvar_t      *snd_rate;
--static cvar_t      *snd_stereo;
-+cvar_t      *snd_bits;
-+cvar_t      *snd_device;
-+cvar_t      *snd_rate;
-+cvar_t      *snd_stereo;
- 
- #define QF_ALSA_NEED(ret, func, params) \
- static ret (*qf##func) params;
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_disk.c quakeforge-new/libs/audio/targets/snd_disk.c
---- quakeforge-0.5.5/libs/audio/targets/snd_disk.c	2004-01-07 22:46:11.000000000 -0500
-+++ quakeforge-new/libs/audio/targets/snd_disk.c	2006-03-28 14:51:31.000000000 -0500
-@@ -55,7 +55,7 @@
- 
- static int  snd_inited;
- static QFile      *snd_file;
--static int snd_blocked = 0;
-+int snd_blocked = 0;
- static volatile dma_t sn;
- 
- static plugin_t				plugin_info;
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_oss.c quakeforge-new/libs/audio/targets/snd_oss.c
---- quakeforge-0.5.5/libs/audio/targets/snd_oss.c	2004-01-15 21:50:26.000000000 -0500
-+++ quakeforge-new/libs/audio/targets/snd_oss.c	2006-03-28 14:52:24.000000000 -0500
-@@ -85,10 +85,10 @@
- 
- static int			tryrates[] = { 11025, 22050, 22051, 44100, 8000 };
- 
--static cvar_t	   *snd_stereo;
--static cvar_t	   *snd_rate;
--static cvar_t	   *snd_device;
--static cvar_t	   *snd_bits;
-+cvar_t	   *snd_stereo;
-+cvar_t	   *snd_rate;
-+cvar_t	   *snd_device;
-+cvar_t	   *snd_bits;
- static cvar_t	   *snd_oss_mmaped;
- 
- static plugin_t           plugin_info;
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_sdl.c quakeforge-new/libs/audio/targets/snd_sdl.c
---- quakeforge-0.5.5/libs/audio/targets/snd_sdl.c	2004-01-07 22:46:11.000000000 -0500
-+++ quakeforge-new/libs/audio/targets/snd_sdl.c	2006-03-28 14:52:38.000000000 -0500
-@@ -51,7 +51,7 @@
- 
- static dma_t sn;
- static int  snd_inited;
--static int snd_blocked = 0;
-+int snd_blocked = 0;
- 
- static int desired_speed = 11025;
- static int desired_bits = 16;
-diff -burN quakeforge-0.5.5/libs/console/client.c quakeforge-new/libs/console/client.c
---- quakeforge-0.5.5/libs/console/client.c	2004-03-01 22:55:17.000000000 -0500
-+++ quakeforge-new/libs/console/client.c	2006-03-28 14:56:43.000000000 -0500
-@@ -84,7 +84,7 @@
- 
- static cvar_t *con_notifytime;				// seconds
- static cvar_t *con_alpha;
--static cvar_t *con_size;
-+cvar_t *con_size;
- static cvar_t *con_speed;
- static cvar_t *cl_chatmode;
- 
-diff -burN quakeforge-0.5.5/libs/console/server.c quakeforge-new/libs/console/server.c
---- quakeforge-0.5.5/libs/console/server.c	2004-01-27 00:23:36.000000000 -0500
-+++ quakeforge-new/libs/console/server.c	2006-03-28 14:56:31.000000000 -0500
-@@ -70,7 +70,7 @@
- 
- #include "compat.h"
- 
--static console_data_t con_data;
-+console_data_t con_data;
- 
- static QFile  *log_file;
- static cvar_t *sv_logfile;
-diff -burN quakeforge-0.5.5/libs/gib/gib_classes.c quakeforge-new/libs/gib/gib_classes.c
---- quakeforge-0.5.5/libs/gib/gib_classes.c	2003-11-28 21:01:31.000000000 -0500
-+++ quakeforge-new/libs/gib/gib_classes.c	2006-03-28 14:57:41.000000000 -0500
-@@ -192,7 +192,7 @@
- 	unsigned int size;
- 	unsigned int i = 0;
- 	
--	static qboolean
-+	qboolean
- 	iterator (gib_class_t *class, void *unused)
- 	{
- 		reply[i++] = class->name;
-@@ -610,13 +610,13 @@
- 	gib_classdesc_t desc;
- 	enum {CLASS, INSTANCE} mode = INSTANCE;
- 	
--	static void
-+	void
- 	mtabfree (void *mtab, void *unused)
- 	{
- 		free (mtab);
- 	}
- 
--	static const char *
-+	const char *
- 	fname (const char *str)
- 	{
- 		if (mode == INSTANCE)
-diff -burN quakeforge-0.5.5/libs/gib/gib_function.c quakeforge-new/libs/gib/gib_function.c
---- quakeforge-0.5.5/libs/gib/gib_function.c	2004-04-09 14:18:19.000000000 -0400
-+++ quakeforge-new/libs/gib/gib_function.c	2006-03-28 14:58:10.000000000 -0500
-@@ -169,7 +169,7 @@
- 	gib_var_t  *var;
- 	static char argss[] = "args";
- 
--	static qboolean 
-+	qboolean 
- 	iterate (char *arg, llist_node_t *node)
- 	{	
- 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
-@@ -207,7 +207,7 @@
- 	gib_var_t  *var;
- 	static char argss[] = "args";
- 
--	static qboolean 
-+	qboolean 
- 	iterate (char *arg, llist_node_t *node)
- 	{	
- 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
-diff -burN quakeforge-0.5.5/libs/gib/gib_thread.c quakeforge-new/libs/gib/gib_thread.c
---- quakeforge-0.5.5/libs/gib/gib_thread.c	2003-09-11 02:03:10.000000000 -0400
-+++ quakeforge-new/libs/gib/gib_thread.c	2006-03-28 14:58:26.000000000 -0500
-@@ -89,7 +89,7 @@
- void
- GIB_Thread_Execute (void)
- {
--	static qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
-+	qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
- 	{
- 		if (GIB_DATA(cbuf)->program)
- 			Cbuf_Execute_Stack (cbuf);
-diff -burN quakeforge-0.5.5/qw/source/cl_chat.c quakeforge-new/qw/source/cl_chat.c
---- quakeforge-0.5.5/qw/source/cl_chat.c	2003-07-18 02:27:26.000000000 -0400
-+++ quakeforge-new/qw/source/cl_chat.c	2006-03-28 15:01:54.000000000 -0500
-@@ -66,7 +66,7 @@
- static void
- CL_Ignore_Sanity_Check (void)
- {
--	static qboolean iterator (ignore_t *ig, llist_node_t *node)
-+	qboolean iterator (ignore_t *ig, llist_node_t *node)
- 	{
- 		if (cl.players[ig->slot].userid != ig->uid) // We got out of sync somehow
- 			llist_remove (node);
-@@ -80,12 +80,12 @@
- {
- 	CL_Ignore_Sanity_Check ();
- 	if (Cmd_Argc () == 1) {
--		static qboolean live_iterator (ignore_t *ig, llist_node_t *node)
-+		qboolean live_iterator (ignore_t *ig, llist_node_t *node)
- 		{
- 			Sys_Printf ("%5i - %s\n", ig->uid, Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
- 			return true;
- 		}
--		static qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
-+		qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
- 		{
- 			Sys_Printf ("%s\n", ig->lastname);
- 			return true;
-@@ -145,7 +145,7 @@
- 	dstring_t *test = dstring_newstr ();
- 	qboolean allowed = true;
- 
--	static qboolean iterator (ignore_t *ig, llist_node_t *node)
-+	qboolean iterator (ignore_t *ig, llist_node_t *node)
- 	{
- 		if (cl.players[ig->slot].userid != ig->uid) { // We got out of sync somehow
- 			llist_remove (node);
-@@ -183,7 +183,7 @@
- {
- 	ignore_t *found = 0;
- 
--	static qboolean iterator (ignore_t *ig, llist_node_t *node)
-+	qboolean iterator (ignore_t *ig, llist_node_t *node)
- 	{
- 		if (!strcmp (ig->lastname, name)) {
- 			found = ig;
-diff -burN quakeforge-0.5.5/tools/qfcc/source/method.c quakeforge-new/tools/qfcc/source/method.c
---- quakeforge-0.5.5/tools/qfcc/source/method.c	2004-02-16 19:39:21.000000000 -0500
-+++ quakeforge-new/tools/qfcc/source/method.c	2006-03-28 15:04:18.000000000 -0500
-@@ -61,7 +61,7 @@
- #include "struct.h"
- #include "type.h"
- 
--static hashtab_t *known_methods;
-+hashtab_t *known_methods;
- 
- static const char *
- method_get_key (void *meth, void *unused)
-diff -burN quakeforge-0.5.5/libs/video/targets/context_x11.c quakeforge-new/libs/video/targets/context_x11.c
---- quakeforge-0.5.5/libs/video/targets/context_x11.c	2006-03-29 15:29:07.000000000 -0500
-+++ quakeforge-new/libs/video/targets/context_x11.c	2006-03-29 15:29:49.000000000 -0500
-@@ -97,7 +97,7 @@
- static XF86VidModeModeInfo **vidmodes;
- static int		nummodes;
- static int		original_mode = 0;
--static vec3_t	x_gamma = {-1, -1, -1};
-+vec3_t	x_gamma = {-1, -1, -1};
- static qboolean	vidmode_avail = false;
- #endif
- 
-diff -burN quakeforge-0.5.5/libs/video/targets/vid_x11.c quakeforge-new/libs/video/targets/vid_x11.c
---- quakeforge-0.5.5/libs/video/targets/vid_x11.c	2006-03-29 15:29:07.000000000 -0500
-+++ quakeforge-new/libs/video/targets/vid_x11.c	2006-03-29 15:30:15.000000000 -0500
-@@ -86,7 +86,7 @@
- static Colormap x_cmap;
- static GC		x_gc;
- 
--static qboolean doShm;
-+qboolean doShm;
- static XShmSegmentInfo x_shminfo[2];
- 
- static int	current_framebuffer;
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch
deleted file mode 100644
index 9ce55330c7c1..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- libs/audio/cd/Makefile.am.old	2011-04-18 11:40:51.058924897 +0200
-+++ libs/audio/cd/Makefile.am	2011-04-18 12:24:29.486917778 +0200
-@@ -5,13 +5,12 @@
- SDL_LIBS= @SDL_LIBS@
- XMMS_LIBS= @XMMS_LIBS@
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
- 
--plugin_PROGRAMS=	@CD_PLUGIN_TARGETS@
--noinst_PROGRAMS=	@CD_PLUGIN_STATIC@
--EXTRA_PROGRAMS=	cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_xmms.la
-+plugin_LTLIBRARIES=	@CD_PLUGIN_TARGETS@
-+EXTRA_LTLIBRARIES=	cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_xmms.la
- 
- cd_file_la_LDFLAGS= $(plugin_ldflags)
- cd_file_la_SOURCES= cd_file.c
-@@ -20,19 +19,19 @@
- cd_linux_la_SOURCES=	cd_linux.c
- 
- cd_sdl_la_LDFLAGS=	$(plugin_ldflags)
--cd_sdl_la_LDADD=	$(SDL_LIBS) $(plugin_libadd)
-+cd_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
- cd_sdl_la_CFLAGS=	$(SDL_CFLAGS)
- cd_sdl_la_SOURCES=	cd_sdl.c
- 
- cd_sgi_la_LDFLAGS=	$(plugin_ldflags)
--cd_sgi_la_LDADD=	$(SGI_CD_LIBS)
-+cd_sgi_la_LIBADD=	$(SGI_CD_LIBS)
- cd_sgi_la_SOURCES=	cd_sgi.c
- 
- cd_win_la_LDFLAGS=	$(plugin_ldflags)
--cd_win_la_LDADD=	$(plugin_libadd)
-+cd_win_la_LIBADD=	$(plugin_libadd)
- cd_win_la_SOURCES=	cd_win.c
- 
- cd_xmms_la_LDFLAGS=	$(plugin_ldflags)
--cd_xmms_la_LDADD=	$(XMMS_LIBS)
-+cd_xmms_la_LIBADD=	$(XMMS_LIBS)
- cd_xmms_la_CFLAGS=	$(XMMS_CFLAGS)
- cd_xmms_la_SOURCES=	cd_xmms.c
---- libs/audio/targets/Makefile.am.old	2011-04-18 12:50:20.674846930 +0200
-+++ libs/audio/targets/Makefile.am	2011-04-18 12:53:22.220844800 +0200
-@@ -4,39 +4,38 @@
- INCLUDES= -I$(top_srcdir)/include
- SDL_LIBS = @SDL_LIBS@
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
- 
--plugin_PROGRAMS=	@SND_PLUGIN_TARGETS@
--noinst_PROGRAMS=	@SND_PLUGIN_STATIC@
--EXTRA_PROGRAMS= \
-+plugin_LTLIBRARIES=	@SND_PLUGIN_TARGETS@
-+EXTRA_LTLIBRARIES= \
- 	snd_output_sdl.la snd_output_alsa.la snd_output_alsa0_9.la\
- 	snd_output_oss.la snd_output_sgi.la snd_output_sun.la \
- 	snd_output_win.la snd_output_dx.la snd_output_disk.la
- 
- snd_output_sdl_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_sdl_la_LDADD=	$(SDL_LIBS) $(plugin_libadd)
-+snd_output_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
- snd_output_sdl_la_CFLAGS=	$(SDL_CFLAGS)
- snd_output_sdl_la_SOURCES=	snd_sdl.c
- 
- snd_output_alsa_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_alsa_la_LDADD=
-+snd_output_alsa_la_LIBADD=
- snd_output_alsa_la_CFLAGS=	$(ALSA_CFLAGS)
- snd_output_alsa_la_SOURCES=	snd_alsa.c
- 
- snd_output_alsa0_9_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_alsa0_9_la_LDADD=
-+snd_output_alsa0_9_la_LIBADD=
- snd_output_alsa0_9_la_CFLAGS=	$(ALSA_CFLAGS)
- snd_output_alsa0_9_la_SOURCES=	snd_alsa_0_9.c
- 
- snd_output_oss_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_oss_la_LDADD=	$(OSS_LIBS)
-+snd_output_oss_la_LIBADD=	$(OSS_LIBS)
- snd_output_oss_la_CFLAGS=	$(OSS_CFLAGS)
- snd_output_oss_la_SOURCES=	snd_oss.c
- 
- snd_output_sgi_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_sgi_la_LDADD=	$(SGISND_LIBS)
-+snd_output_sgi_la_LIBADD=	$(SGISND_LIBS)
- snd_output_sgi_la_CFLAGS=	$(SGISND_CFLAGS)
- snd_output_sgi_la_SOURCES=	snd_sgi.c
- 
-@@ -45,16 +44,16 @@
- snd_output_sun_la_SOURCES=	snd_sun.c
- 
- snd_output_win_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_win_la_LDADD=	$(WINSND_LIBS) $(plugin_libadd)
-+snd_output_win_la_LIBADD=	$(WINSND_LIBS) $(plugin_libadd)
- snd_output_win_la_CFLAGS=	$(WIN32SND_CFLAGS)
- snd_output_win_la_SOURCES=	snd_win.c
- 
- snd_output_dx_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_dx_la_LDADD=		$(WINSND_LIBS) $(plugin_libadd)
-+snd_output_dx_la_LIBADD=	$(WINSND_LIBS) $(plugin_libadd)
- snd_output_dx_la_CFLAGS=	$(WIN32SND_CFLAGS)
- snd_output_dx_la_SOURCES=	snd_dx.c
- 
- snd_output_disk_la_LDFLAGS=	$(plugin_ldflags)
--snd_output_disk_la_LDADD=	$(plugin_libadd)
-+snd_output_disk_la_LIBADD=	$(plugin_libadd)
- snd_output_disk_la_CFLAGS=
- snd_output_disk_la_SOURCES=	snd_disk.c
---- libs/audio/renderer/Makefile.am.old	2011-04-18 12:54:32.560697490 +0200
-+++ libs/audio/renderer/Makefile.am	2011-04-18 12:55:21.157363865 +0200
-@@ -3,21 +3,19 @@
- AM_CFLAGS= @PREFER_PIC@ @VORBIS_CFLAGS@ @OGG_CFLAGS@
- INCLUDES= -I$(top_srcdir)/include
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
- 
--plugin_PROGRAMS=	@SND_REND_TARGETS@
--EXTRA_PROGRAMS=	snd_render_default.la
--
--noinst_PROGRAMS=	@SND_REND_STATIC@
-+plugin_LTLIBRARIES=	@SND_REND_TARGETS@
-+EXTRA_LTLIBRARIES=	snd_render_default.la
- 
- snd_render_default_la_LDFLAGS=	$(plugin_ldflags)
- snd_render_default_la_SOURCES=	snd_dma.c snd_mem.c snd_mix.c vorbis.c wav.c midi.c
- if ASM_ARCH
--snd_render_default_la_LDADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
-+snd_render_default_la_LIBADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
- snd_render_default_la_DEPENDENCIES=
- else
--snd_render_default_la_LDADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
-+snd_render_default_la_LIBADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
- snd_render_default_la_DEPENDENCIES=
- endif
---- libs/console/Makefile.am.old	2011-04-18 12:56:29.253106265 +0200
-+++ libs/console/Makefile.am	2011-04-18 12:57:28.784383855 +0200
-@@ -3,14 +3,13 @@
- AM_CFLAGS= @PREFER_PIC@
- INCLUDES= -I$(top_srcdir)/include
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
- 
- lib_LTLIBRARIES=	libQFconsole.la
--plugin_PROGRAMS= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
--noinst_PROGRAMS= @SERVER_PLUGIN_STATIC@ @CLIENT_PLUGIN_STATIC@
--EXTRA_PROGRAMS=  console_server.la console_client.la
-+plugin_LTLIBRARIES= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
-+EXTRA_LTLIBRARIES=  console_server.la console_client.la
- 
- common_sources= \
- 	buffer.c complete.c console.c inputline.c list.c filelist.c view.c
-@@ -22,9 +21,9 @@
- libQFconsole_la_SOURCES=	$(common_sources)
- 
- console_client_la_LDFLAGS=	$(plugin_ldflags)
--console_client_la_LDADD=	$(plugin_libadd)
-+console_client_la_LIBADD=	$(plugin_libadd)
- console_client_la_SOURCES=	$(client_sources)
- 
- console_server_la_LDFLAGS=	$(plugin_ldflags)
--console_server_la_LDADD=	$(CURSES_LIBS) $(plugin_libadd)
-+console_server_la_LIBADD=	$(CURSES_LIBS) $(plugin_libadd)
- console_server_la_SOURCES=	$(server_sources)
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch
deleted file mode 100644
index fb027dd03c04..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- nq/source/sys_sdl.c.old	2007-01-14 12:34:48.000000000 +0100
-+++ nq/source/sys_sdl.c	2007-01-14 12:35:43.000000000 +0100
-@@ -63,6 +63,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
- 
- #include "client.h"
- #include "compat.h"
-@@ -107,6 +108,9 @@
- #endif
- }
- 
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- #ifndef SDL_main
- # define SDL_main main
- #endif
---- qw/source/cl_sys_sdl.c.old	2007-01-14 12:29:25.000000000 +0100
-+++ qw/source/cl_sys_sdl.c	2007-01-14 12:30:50.000000000 +0100
-@@ -63,6 +63,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
- 
- #include "client.h"
- #include "compat.h"
-@@ -108,6 +109,9 @@
- #endif
- }
- 
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- #ifndef SDL_main
- # define SDL_main main
- #endif
---- qw/source/cl_sys_unix.c.old	2007-01-14 12:33:15.000000000 +0100
-+++ qw/source/cl_sys_unix.c	2007-01-14 12:34:02.000000000 +0100
-@@ -56,6 +56,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
- 
- #include "host.h"
- #include "netchan.h"
-@@ -73,6 +74,9 @@
- 
- int         skipframes;
- 
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- int
- main (int c, const char *v[])
- {
---- nq/source/sys_unix.c.old	2007-01-14 13:01:20.000000000 +0100
-+++ nq/source/sys_unix.c	2007-01-14 13:01:38.000000000 +0100
-@@ -69,6 +69,9 @@
- 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
- }
- 
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- int
- main (int c, const char *v[])
- {
---- configure.old	2007-01-14 14:06:22.000000000 +0100
-+++ configure	2007-01-14 14:06:43.000000000 +0100
-@@ -22733,7 +22733,7 @@
- int
- main ()
- {
--void *(*foo)(size_t) = alloca;
-+void *foo = alloca(sizeof(void));
-   ;
-   return 0;
- }
-@@ -32304,7 +32304,7 @@
- 
- 
- if test "x$BUILD_SW" = xyes; then
--	VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la"
-+	VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
- 	VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
- fi
- if test "x$BUILD_SW32" = xyes; then
---- libs/video/renderer/Makefile.in.old	2007-01-14 15:00:14.000000000 +0100
-+++ libs/video/renderer/Makefile.in	2007-01-14 15:02:08.000000000 +0100
-@@ -409,7 +409,7 @@
- libQFrenderer_gl_la_LIBADD = gl/libgl.la
- libQFrenderer_gl_la_SOURCES = $(common_sources)
- libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la
--libQFrenderer_sw_la_LDFLAGS = @STATIC@
-+libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
- libQFrenderer_sw_la_LIBADD = sw/libsw.la
- libQFrenderer_sw_la_SOURCES = $(common_sources)
- libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch
deleted file mode 100644
index 0161c606c891..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://quake.git.sourceforge.net/git/gitweb.cgi?p=quake/quakeforge;a=commit;h=cdf5ef256583dea6caa34464f6a82222cc43d2fd
-
---- libs/net/nc/net_udp6.c
-+++ libs/net/nc/net_udp6.c
-@@ -111,10 +111,10 @@ static __attribute__ ((used)) const char rcsid[] =
- # define MAXHOSTNAMELEN	512
- #endif
- 
--#ifdef __GLIBC__						// glibc macro
-+#if defined(__GLIBC__) && !defined(s6_addr32)	// glibc macro
- # define s6_addr32 in6_u.u6_addr32
- # if ! __GLIBC_PREREQ (2,2)
--# define ss_family __ss_family
-+#  define ss_family __ss_family
- # endif
- #endif
- 
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch
deleted file mode 100644
index c18ec176fbf8..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-do not use kernel headers' asm/page.h
-
-http://bugs.gentoo.org/187083
-
---- libs/video/targets/vid_fbdev.c
-+++ libs/video/targets/vid_fbdev.c
-@@ -58,7 +58,7 @@
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <asm/page.h>
-+#define PAGE_MASK sysconf(_SC_PAGE_SIZE)
- #include <linux/kd.h>
- #include <linux/vt.h>
- #include <sys/stat.h>
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch
deleted file mode 100644
index 5f3674155143..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- tools/qwaq/Makefile.am.old	2009-11-20 15:10:00.000000000 +0100
-+++ tools/qwaq/Makefile.am	2009-11-20 15:10:22.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
- QFCC=$(top_builddir)/tools/qfcc/source/qfcc
--QCFLAGS=-qq -g -Werror --advanced
-+QCFLAGS=-qq -g --advanced
- 
- if BUILD_QWAQ
- qwaq=qwaq
---- ruamoko/lib/Makefile.am.old	2009-11-20 15:12:00.000000000 +0100
-+++ ruamoko/lib/Makefile.am	2009-11-20 15:12:17.000000000 +0100
-@@ -3,7 +3,7 @@
- pkglibdir=$(libdir)/ruamoko
- 
- QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=$(INCLUDES)
- PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
- RANLIB=touch
---- ruamoko/game/Makefile.am.old	2009-11-20 15:13:05.000000000 +0100
-+++ ruamoko/game/Makefile.am	2009-11-20 15:13:21.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
- QFCC=$(QFCC_DEP)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include
- GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
- if HAVE_ZLIB
---- ruamoko/gui/Makefile.am.old	2009-11-20 15:13:52.000000000 +0100
-+++ ruamoko/gui/Makefile.am	2009-11-20 15:14:09.000000000 +0100
-@@ -3,7 +3,7 @@
- pkglibdir=$(libdir)/ruamoko
- 
- QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=$(INCLUDES)
- PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
- RANLIB=touch
---- ruamoko/cl_menu/Makefile.am.old	2009-11-20 15:14:37.000000000 +0100
-+++ ruamoko/cl_menu/Makefile.am	2009-11-20 15:15:03.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
- QFCC=$(QFCC_DEP)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include -I$(top_builddir)/include -I$(top_srcdir)/include
- GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
- if HAVE_ZLIB
---- configure.ac.old	2009-11-20 15:15:35.000000000 +0100
-+++ configure.ac	2009-11-20 15:16:04.000000000 +0100
-@@ -92,6 +92,7 @@
- AC_PROG_RANLIB
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
-+AM_PROG_AS
- 
- AC_PROG_YACC
- if echo $YACC | grep -v bison > /dev/null; then
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch
deleted file mode 100644
index eae1e1e44785..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/421547
-http://quake.git.sourceforge.net/git/gitweb.cgi?p=quake/quakeforge;a=commit;h=d8a37bc7910366904ef4559bef3b13feec378113
-
---- libs/util/quakeio.c
-+++ libs/util/quakeio.c
-@@ -80,7 +80,7 @@ static __attribute__ ((used)) const char rcsid[] =
- struct QFile_s {
- 	FILE *file;
- #ifdef HAVE_ZLIB
--	gzFile *gzfile;
-+	gzFile gzfile;
- #endif
- 	off_t size;
- 	off_t start;
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
deleted file mode 100644
index c02158d854fb..000000000000
--- a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit base eutils autotools games
-
-DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine"
-HOMEPAGE="http://www.quakeforge.net/"
-SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="cdinstall debug fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss"
-RESTRICT="userpriv"
-
-RDEPEND="
-	opengl? ( virtual/opengl )
-	sdl? ( media-libs/libsdl )
-	svga? ( media-libs/svgalib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-	)
-	ncurses? ( sys-libs/ncurses )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-	)
-	dga? ( x11-libs/libXxf86dga )
-	alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-	cdinstall? ( games-fps/quake1-data )
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-page-size.patch
-	"${FILESDIR}"/${PV}-ipv6.patch
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-keys.patch
-	"${FILESDIR}"/${P}-amd64.patch
-	"${FILESDIR}"/${P}-noWerror.patch
-	"${FILESDIR}"/${P}-gcc46.patch
-	"${FILESDIR}"/${P}-zlib-1.2.6.patch
-	"${FILESDIR}"/${P}-libc.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	#i should do this at some point :x ... i guess if you disable all shared stuff
-	#and enable all the static options explicitly, static works ... (or so ive been told)
-	#if ! use static ; then
-	#	myconf="${myconf} --enable-shared=yes --enable-static=no"
-	#else
-	#	myconf="${myconf} --enable-shared=no --enable-static=yes"
-	#fi
-
-	local debugopts
-	use debug \
-		&& debugopts="--enable-debug --disable-optimize --enable-profile" \
-		|| debugopts="--disable-debug --disable-profile"
-
-	local clients=${QF_CLIENTS}
-	use fbcon && clients="${clients},fbdev"
-	use opengl && clients="${clients},glx"
-	use sdl && clients="${clients},sdl,sdl32"
-	use sdl && use opengl && clients="${clients},sgl"
-	use svga && clients="${clients},svga"
-	use X && clients="${clients},x11"
-	use X && use opengl && clients="${clients},wgl"
-	[ "${clients:0:1}" == "," ] && clients=${clients:1}
-
-	local servers=${QF_SERVERS:-master,nq,qw,qtv}
-
-	local tools=${QF_TOOLS:-all}
-
-	local svgaconf	# use old school way for broken conf opts
-	use svga \
-		&& svgaconf="--with-svga=/usr" \
-		|| svgaconf="--without-svga"
-
-	addpredict "$(games_get_libdir)"
-	egamesconf \
-		$(use_enable ncurses curses) \
-		$(use_enable vorbis) \
-		$(use_enable zlib) \
-		$(use_with ipv6) \
-		$(use_with fbcon fbdev) \
-		${svgaconf} \
-		$(use_with X x) \
-		$(use_enable xv vidmode) \
-		$(use_enable dga) \
-		$(use_enable sdl) \
-		--disable-xmms \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		--enable-sound \
-		--disable-optimize \
-		${debugopts} \
-		--with-global-cfg="${GAMES_SYSCONFDIR}"/quakeforge.conf \
-		--with-sharepath="${GAMES_DATADIR}"/quake1 \
-		--with-clients=${clients} \
-		--with-servers=${servers} \
-		--with-tools=${tools}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	mv "${D}/${GAMES_PREFIX}"/include "${D}"/usr/
-	dodoc ChangeLog NEWS TODO doc/*txt
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	# same warning used in quake1 / quakeforge / nprquake-sdl
-	games_pkg_postinst
-	echo
-	elog "Before you can play, you must make sure"
-	elog "${PN} can find your Quake .pak files"
-	elog
-	elog "You have 2 choices to do this"
-	elog "1 Copy pak*.pak files to ${GAMES_DATADIR}/quake1/id1"
-	elog "2 Symlink pak*.pak files in ${GAMES_DATADIR}/quake1/id1"
-	elog
-	elog "Example:"
-	elog "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/"
-	elog "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak ${GAMES_DATADIR}/quake1/id1/pak0.pak"
-	elog
-	elog "You only need pak0.pak to play the demo version,"
-	elog "the others are needed for registered version"
-}
diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index f4447c4547d5..91a109daa133 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="cdinstall debug fbcon flac sdl X ncurses png vorbis zlib ipv6 xv dga alsa oss xdg wildmidi"
 RESTRICT="userpriv"
 
diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 743dd098398b..b55ec8496c0e 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1 +1,2 @@
 DIST sauerbraten_2013_01_04_collect_edition_linux.tar.bz2 589939261 SHA256 3ecc27c318125883763130e45805eb7ba3a426234e5766ab0d00522f4a437bd1 SHA512 f89c9e69bb69596829661f551e4b63b2f2af96a01f075cb94a80e2bfae4f8664b7dab8f4850b91499817240e0311b64b049ea985c761ff7bb6d39ed75e6198cd WHIRLPOOL d10e354942180064ab44a2f8c8b13819240fde3537825908768d1ddda24f600971641b8a9cee4abee9539ec912bf265cb1771c001ad81a33e287c99e0f6906b8
+DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 SHA256 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e SHA512 7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897 WHIRLPOOL 47a21e233dc90b5284027dbe47d13e891a434e0e550c6102a456e6300e6d5f9daba23c27fc100428161641ba276fa13faac12b935ac590a108c516b9b7987f4e
diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
new file mode 100644
index 000000000000..21f1b13c7a2a
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
@@ -0,0 +1,50 @@
+applied on top of sauerbraten-2013.01.04-system-enet.patch
+
+respect LDFLAGS, CXXFLAGS and CPPFLAGS
+--- sauerbraten/src/Makefile
++++ sauerbraten/src/Makefile
+@@ -1,4 +1,4 @@
+-CXXFLAGS= -O3 -fomit-frame-pointer
++CXXFLAGS ?= -O3 -fomit-frame-pointer
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
+ PLATFORM= $(shell uname -s)
+@@ -139,11 +139,11 @@
+ 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
+ 
+ %.h.gch: %.h
+-	$(CXX) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
+ 	$(MV) $(subst .h.gch,.tmp.h.gch,$@) $@
+ 
+ %-standalone.o: %.cpp
+-	$(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
+ 
+ $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
+ $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
+@@ -168,19 +168,19 @@
+ install: all
+ else
+ client:	$(CLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ server:	$(SERVER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
+ 	
+ master: $(MASTER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
+ 
+ shared/cube2font.o: shared/cube2font.c
+-	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
+ 
+ cube2font: shared/cube2font.o
+-	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
+ 
+ install: all
+ 	cp sauer_client	../bin_unix/$(PLATFORM_PREFIX)_client
diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
new file mode 100644
index 000000000000..e87b280ba0c1
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
@@ -0,0 +1,64 @@
+--- sauerbraten/src/Makefile
++++ sauerbraten/src/Makefile
+@@ -4,7 +4,7 @@
+ PLATFORM= $(shell uname -s)
+ PLATFORM_PREFIX= native
+ 
+-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
++INCLUDES= -Ishared -Iengine -Ifpsgame
+ 
+ STRIP=
+ ifeq (,$(findstring -g,$(CXXFLAGS)))
+@@ -36,8 +36,8 @@
+ endif
+ CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
+ else	
+-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags`
++CLIENT_LIBS= -lenet -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt
+@@ -106,7 +106,7 @@
+ MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
+ else
+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
+-SERVER_LIBS= -Lenet/.libs -lenet -lz
++SERVER_LIBS= -lenet -lz
+ MASTER_LIBS= $(SERVER_LIBS)
+ endif
+ SERVER_OBJS= \
+@@ -135,15 +135,6 @@
+ 
+ all: client server
+ 
+-enet/Makefile:
+-	cd enet; ./configure --enable-shared=no --enable-static=yes
+-	
+-libenet: enet/Makefile
+-	$(MAKE)	-C enet/ all
+-
+-clean-enet: enet/Makefile
+-	$(MAKE) -C enet/ clean
+-
+ clean:
+ 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
+ 
+@@ -176,13 +167,13 @@
+ 
+ install: all
+ else
+-client:	libenet $(CLIENT_OBJS)
++client:	$(CLIENT_OBJS)
+ 	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 
+-server:	libenet $(SERVER_OBJS)
++server:	$(SERVER_OBJS)
+ 	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
+ 	
+-master: libenet $(MASTER_OBJS)
++master: $(MASTER_OBJS)
+ 	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
+ 
+ shared/cube2font.o: shared/cube2font.c
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
new file mode 100644
index 000000000000..bdde5080cbc8
--- /dev/null
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils games
+
+EDITION="collect_edition"
+DESCRIPTION="Cube 2: Sauerbraten is an open source game engine (Cube 2) with freeware game data (Sauerbraten)"
+HOMEPAGE="http://sauerbraten.org/"
+SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2"
+
+LICENSE="ZLIB freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated server"
+
+RDEPEND="
+	sys-libs/zlib
+	>=net-libs/enet-1.3.6:1.3
+	!dedicated? (
+		media-libs/libsdl[X,opengl]
+		media-libs/sdl-mixer[vorbis]
+		media-libs/sdl-image[png,jpeg]
+		virtual/opengl
+		virtual/glu
+		x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	ecvs_clean
+	rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp}
+
+	# Patch makefile to use system enet instead of bundled
+	# respect CXXFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${P}-{system-enet,QA}.patch
+
+	# Fix links so they point to the correct directory
+	sed -i -e 's:docs/::' README.html || die
+}
+
+src_compile() {
+	use debug && append-cppflags -D_DEBUG
+	emake -C src master $(usex dedicated "server" "$(usex server "server client" "client")")
+}
+
+src_install() {
+	local LIBEXECDIR="${GAMES_PREFIX}/lib"
+	local DATADIR="${GAMES_DATADIR}/${PN}"
+	local STATEDIR="${GAMES_STATEDIR}/${PN}"
+
+	if ! use dedicated ; then
+		# Install the game data
+		insinto "${DATADIR}"
+		doins -r data packages
+
+		# Install the client executable
+		exeinto "${LIBEXECDIR}"
+		doexe src/sauer_client
+
+		# Install the client wrapper
+		games_make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}"
+
+		# Create menu entry
+		newicon -s 256 data/cube.png ${PN}.png
+		make_desktop_entry "${PN}-client" "Cube 2: Sauerbraten"
+	fi
+
+	# Install the server config files
+	insinto "${STATEDIR}"
+	doins "server-init.cfg"
+
+	# Install the server executables
+	exeinto "${LIBEXECDIR}"
+	doexe src/sauer_master
+	use dedicated || use server && doexe src/sauer_server
+
+	games_make_wrapper "${PN}-server" \
+		"${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}"
+	games_make_wrapper "${PN}-master" \
+		"${LIBEXECDIR}/sauer_master ${STATEDIR}"
+
+	# Install the server init script
+	keepdir "${GAMES_STATEDIR}/run/${PN}"
+	cp "${FILESDIR}"/${PN}.init "${T}" || die
+	sed -i \
+		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
+		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
+		-e "s:%GAMES_STATEDIR%:${GAMES_STATEDIR}:g" \
+		"${T}"/${PN}.init || die
+	newinitd "${T}"/${PN}.init ${PN}
+	cp "${FILESDIR}"/${PN}.conf "${T}" || die
+	sed -i \
+		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
+		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
+		-e "s:%GAMES_USER_DED%:${GAMES_USER_DED}:g" \
+		-e "s:%GAMES_GROUP%:${GAMES_GROUP}:g" \
+		"${T}"/${PN}.conf || die
+	newconfd "${T}"/${PN}.conf ${PN}
+
+	dodoc src/*.txt docs/dev/*.txt
+	dohtml -r README.html docs/*
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	elog "If you plan to use map editor feature copy all map data from ${DATADIR}"
+	elog "to corresponding folder in your HOME/.${PN}"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-misc/bsd-games-non-free/Manifest b/games-misc/bsd-games-non-free/Manifest
deleted file mode 100644
index 4dbeb8cce3b8..000000000000
--- a/games-misc/bsd-games-non-free/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bsd-games-non-free-2.17.tar.gz 181134 SHA256 912a9253791ec9748dc49ab6cf7aacf417483c50ee04db57ed6d5dca110cb563 SHA512 6648579edbfb2e028d1b096d25d9c00abfafe4db8fc5e51688e6d03853f457d473b3d10bd1388b425227b6196e0e88fb258c5714896647e74b85db86a3715db0 WHIRLPOOL b8b6b29ffce19b7a34e6d8a606d88a83785128e7aaf33927a9dca5b0931ca527ca5079eb75c78a24a47f0c3f33e1c83adbcbcc1d060da9998e323dc686f407e1
diff --git a/games-misc/bsd-games-non-free/bsd-games-non-free-2.17.ebuild b/games-misc/bsd-games-non-free/bsd-games-non-free-2.17.ebuild
deleted file mode 100644
index bafa60a0ed42..000000000000
--- a/games-misc/bsd-games-non-free/bsd-games-non-free-2.17.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit games
-
-DESCRIPTION="collection of games from NetBSD"
-HOMEPAGE="http://www.advogato.org/proj/bsd-games/"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz"
-
-# See /usr/share/doc/${P}/CHANGES.rogue
-LICENSE="|| ( BSD free-noncomm )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-# Set GAMES_TO_BUILD variable to whatever you want
-export GAMES_TO_BUILD=${GAMES_TO_BUILD:="rogue"}
-
-src_prepare() {
-	sed -i \
-		-e '/^CC :/d' \
-		-e '/^CXX :/d' \
-		Makeconfig.in \
-		|| die "sed failed"
-	cp "${FILESDIR}"/config.params-gentoo config.params || die "cp failed"
-	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params
-	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params
-}
-
-src_configure() {
-	./configure || die
-}
-
-src_compile() {
-	emake OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-build_game() {
-	has ${1} ${GAMES_TO_BUILD}
-}
-
-do_statefile() {
-	touch "${D}/${GAMES_STATEDIR}/${1}"
-	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}"
-}
-
-src_install() {
-	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -rf "${D}"/usr/share/doc/bsd-games || die "Remove failed"
-
-	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 NEWS \
-		  PACKAGING README README.non-free SECURITY THANKS TODO YEAR2000 \
-		  bsd-games-non-free.lsm
-
-	# state files
-	build_game rogue && do_statefile rogue.scores
-
-	# extra docs
-	build_game rogue && { docinto rogue ; dodoc rogue/{CHANGES,USD.doc/rogue.me}; }
-
-	prepgamesdirs
-}
diff --git a/games-misc/bsd-games-non-free/files/config.params-gentoo b/games-misc/bsd-games-non-free/files/config.params-gentoo
deleted file mode 100644
index e5f4ed3ff33e..000000000000
--- a/games-misc/bsd-games-non-free/files/config.params-gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# This file is read by configure for the Gentoo ebuild 
-
-# Don't run configure interactively.
-bsd_games_cfg_non_interactive=y
-
-bsd_games_cfg_install_prefix=${D}
-
-# For gentoo, 
-#   banner used to be in util-linux.  Gentoo might have an ebuild
-#   fortune is "app-games/fortune-mod"
-#   factor is in "sys-apps/sh-utils"
-#   dm is not installed by debian, I don't know why
-bsd_games_cfg_no_build_dirs="dm banner fortune factor"
-
-# Gentoo's games eclass want everything in these places
-bsd_games_cfg_gamesdir=${GAMES_BINDIR}
-bsd_games_cfg_sbindir=${GAMES_BINDIR}
-bsd_games_cfg_sharedir=${GAMES_DATADIR}
-bsd_games_cfg_varlibdir=${GAMES_STATEDIR}
-
-# We'll control all the permissions during install (via games eclass) 
-bsd_games_cfg_do_chown=n
-
-# .so or symlink??? (Debian perfers symlinks for manpages)
-bsd_games_cfg_use_dot_so=symlinks
-
-# Gentoo'll handle manpage compressing.
-bsd_games_cfg_gzip_manpages=n
-
-# sys-apps/less is in system (even though more is in /bin)
-bsd_games_cfg_pager=/usr/bin/less
-
-# sys-apps/miscfiles might have too many words for boggle
-bsd_games_cfg_dictionary_src=/usr/share/dict/words
-
-# Acronym file for "wft"
-bsd_games_cfg_wtf_acronymfile=${GAMES_DATADIR}/acronyms
-
diff --git a/games-misc/bsd-games-non-free/metadata.xml b/games-misc/bsd-games-non-free/metadata.xml
deleted file mode 100644
index d3c2cc926f0b..000000000000
--- a/games-misc/bsd-games-non-free/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>games</herd>
-</pkgmetadata>
diff --git a/games-misc/robotfindskitten/Manifest b/games-misc/robotfindskitten/Manifest
index 3c8d8e07f371..f0aa6ff0caf1 100644
--- a/games-misc/robotfindskitten/Manifest
+++ b/games-misc/robotfindskitten/Manifest
@@ -1,2 +1 @@
-DIST robotfindskitten-1.7320508.406.tar.gz 406412 SHA256 08c8a826c3cf90a7f3dc1d42b087425af661971585f125b9bedca2bcc2a11852 SHA512 96c8f9968336cda5f079ca4b69a17a76444a3291b1354d594d2a9b89cb0d88296b983c70076da3334774710d811b33a90fe513ba5dca330808e5345e6c920865 WHIRLPOOL 6a60e847d96db16cee9e2a2788ee412c9cf3fc859af164f5e281d4180fad7d9001fb36a58e0ae75a149fe8229780a7024d5dc5f5eb71c9b272c878f87d44312f
 DIST robotfindskitten-2.7182818.701.tar.gz 437810 SHA256 7749a370796fd23e3b306b00de5f7fb7997a35fef30e3910ff159448c932d719 SHA512 736e44a62f016fb2a0dd03e31e6f1fb7c50a9115182812518666f3e4ad69f5703d7018f28ab14e0cfdbc8741656b15fa6ee577c2a5920e0d9af9acb658ac620b WHIRLPOOL f29092a17d5e13c8d9f578e318edf5045bd478c6c4e3ae4f05258ebc4be10736b9bc71e8ab55a287e7accee6f3606a18a4d475c09dbfa59a6bb029e548225d2a
diff --git a/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.ebuild b/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.ebuild
deleted file mode 100644
index 6add5474dd41..000000000000
--- a/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.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 games
-
-DESCRIPTION="Help robot find kitten"
-HOMEPAGE="http://robotfindskitten.org/"
-SRC_URI="mirror://sourceforge/rfk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dogamesbin src/robotfindskitten
-	doinfo doc/robotfindskitten.info
-	dodoc AUTHORS BUGS ChangeLog NEWS README
-	prepgamesdirs
-}
diff --git a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
index 2710f7a4115c..4f91e87ab309 100644
--- a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
+++ b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/rfk/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-mud/tintin/Manifest b/games-mud/tintin/Manifest
index 87db99983be8..50748279d0ae 100644
--- a/games-mud/tintin/Manifest
+++ b/games-mud/tintin/Manifest
@@ -1,2 +1 @@
-DIST tintin-2.01.0.tar.gz 293651 SHA256 e0e35463a97ee5b33ef0b29b2c57fa8276c4e76328cb19c98a6ea92c603a9c76 SHA512 9bad5c3900965ff009c130f5bbeeee197b16bddaf4068329fd3282945ff7b8e17517254468c14f9c9979828ca3ea8bfebacdd3bbfb436d92a02b6ed9ed30af4f WHIRLPOOL e2fb023a38f0be63868ae0f333d19f621624f7b8b0bc8498d0b8cceb0e344df52ba7419829f341b7632a7f1d2c535add215c07911693ee479da74c616433d12a
 DIST tintin-2.01.1.tar.gz 272506 SHA256 cc0ba550880bd5efdba8fde11d1e4ddd4ae8737f81e6f64649de23ed99cbbca4 SHA512 b77a1ecc09438a165a27f70f31132d60350d790e4e6b0509af00979517a7f21838407acdbf1fe0d3b4612853c4e1269679e95fe90b8588133b17f98b85a28b07 WHIRLPOOL 6ed2f53759e6430fb3f785d732341866bc80623343c6b701886d8a3025f6238b7b28bb78e397725a95333c554ffae75932d745678921869133e10b1c5edf1fb4
diff --git a/games-mud/tintin/tintin-2.01.0.ebuild b/games-mud/tintin/tintin-2.01.0.ebuild
deleted file mode 100644
index 8a234acd3c84..000000000000
--- a/games-mud/tintin/tintin-2.01.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit games
-
-DESCRIPTION="(T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t"
-HOMEPAGE="http://tintin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	sys-libs/readline:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/tt/src
-
-src_install () {
-	dogamesbin tt++
-	dodoc ../{CREDITS,FAQ,README,SCRIPTS,TODO,docs/*}
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	ewarn "**** OLD TINTIN SCRIPTS ARE NOT 100% COMPATIBLE WITH THIS VERSION ****"
-	ewarn "read the README for more details."
-	echo
-}
diff --git a/games-mud/tintin/tintin-2.01.1.ebuild b/games-mud/tintin/tintin-2.01.1.ebuild
index fd584055b44c..139981e04b67 100644
--- a/games-mud/tintin/tintin-2.01.1.ebuild
+++ b/games-mud/tintin/tintin-2.01.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/games-puzzle/pauker/pauker-1.8.ebuild b/games-puzzle/pauker/pauker-1.8.ebuild
index 54c6402ddd49..d78842f26e4c 100644
--- a/games-puzzle/pauker/pauker-1.8.ebuild
+++ b/games-puzzle/pauker/pauker-1.8.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/pauker/${P}.src.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/browserlauncher2:1.0
diff --git a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild b/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild
index 2b99b2f0deb8..028619383057 100644
--- a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild
+++ b/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild
@@ -57,6 +57,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	ghc-package_pkg_postinst
+	haskell-cabal_pkg_postinst
 	games_pkg_postinst
 }
diff --git a/games-strategy/triplea/triplea-1.7.0.3.ebuild b/games-strategy/triplea/triplea-1.7.0.3.ebuild
index d5d4a9dad827..e31734ae5e45 100644
--- a/games-strategy/triplea/triplea-1.7.0.3.ebuild
+++ b/games-strategy/triplea/triplea-1.7.0.3.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test" # Needs X11 maybe use virtualx.eclass
 
diff --git a/games-strategy/triplea/triplea-1.8.0.5.ebuild b/games-strategy/triplea/triplea-1.8.0.5.ebuild
index fd9662b393dc..1fb63724cd40 100644
--- a/games-strategy/triplea/triplea-1.8.0.5.ebuild
+++ b/games-strategy/triplea/triplea-1.8.0.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test" # Needs X11 maybe use virtualx.eclass
 
diff --git a/gnome-base/gvfs/gvfs-1.26.2-r1.ebuild b/gnome-base/gvfs/gvfs-1.26.2-r1.ebuild
index 34f7996110cf..4646dba4d1f0 100644
--- a/gnome-base/gvfs/gvfs-1.26.2-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.26.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$
 
@@ -9,7 +9,7 @@ GNOME2_LA_PUNT="yes"
 inherit autotools bash-completion-r1 eutils gnome2
 
 DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
 
 LICENSE="LGPL-2+"
 SLOT="0"
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 6a5565718360..0e09d50d01c1 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,3 +1,2 @@
 DIST cinnamon-settings-daemon-2.6.3.tar.gz 2992102 SHA256 b71a515f9eed5efd35ef134f291a9dd9674d81026b23c85377493b53ec1cf0ae SHA512 ff6ec6be7a134414a525bd5dce6d90570800d0dbfc5f1641b02fbe17389bcf32d47832f5fcd736cdff8dfa09f129f998acd99d9358b1edf5315edb91c8b553ba WHIRLPOOL 9d2fb909fca23f7db2124e56e285e6c7623a9e7d710309f92894a2ab19b6a5a7e92b4e5c947e0cc74513eec30f7fa7bc7464997a1fdc3ff27ad19040579efdb0
-DIST cinnamon-settings-daemon-2.8.1.tar.gz 2934995 SHA256 2e01f7e8900043f8efb28f33814e70ca12eb12b7d49061ce6d059c1a0b0344a0 SHA512 a8c1c685ecc6c03e274b2d26c214f24a9300e8ac4355f7d1f6f81ffb4393b079f7e40d1f1d5cb06509e298d55b4d20ca51e9821cd2894b234512d1287daf3689 WHIRLPOOL 2a029e3a22af1e3a5b9edfc82184244d5c1d8eb61107466110fc1d33ab3e641651d42ee2675c65db78475edcd03e053468d4b2d019e381046cbf8cdab7c74d85
 DIST cinnamon-settings-daemon-2.8.2.tar.gz 2935087 SHA256 fc18a16c843c66d5488d73f29b24a1b5dec82fe17d148d97bbab666280c79624 SHA512 ba24a8411732a21399c91eae0aa562859992bec08dc540897ac132bdfc55834dfffcebd93f687d193da5e92de936078dd47f774b9c8454cfcf174527ee6b8367 WHIRLPOOL 67a5c054f9510bfcd4c1778a17d4a33b5742b66e0c131090a963674360bb371b35a8b783fdcc521c28ae0fed2d263ff48ca80a0b9ddf186a3025d581d23e7271
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild
index b32337369467..4235b31db497 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	>=media-sound/pulseaudio-0.9.16:0=
 	sys-apps/dbus
 	>=sys-auth/polkit-0.97
-	|| ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.9.10:3
 	>=x11-libs/libnotify-0.7.3:0=
@@ -47,6 +46,7 @@ RDEPEND="
 		x11-drivers/xf86-input-wacom
 		x11-libs/libXtst )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
+	|| ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
 	systemd? ( sys-apps/systemd:0= )
 	!systemd? ( sys-auth/consolekit:0= )
 "
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild
deleted file mode 100644
index c57878675678..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	>=media-sound/pulseaudio-0.9.16:0=
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? ( sys-apps/systemd:0= >=sys-power/upower-0.9.11:= )
-	!systemd? ( sys-auth/consolekit:0= sys-power/upower-pm-utils )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	# Fix intltool unittest
-	cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS README"
-
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-man \
-		--enable-polkit \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd logind) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	unset DISPLAY
-	Xemake check
-}
diff --git a/java-virtuals/jaf/jaf-1.1-r1.ebuild b/java-virtuals/jaf/jaf-1.1-r1.ebuild
index 9258e0c79313..0dfec544cd1c 100644
--- a/java-virtuals/jaf/jaf-1.1-r1.ebuild
+++ b/java-virtuals/jaf/jaf-1.1-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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~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=""
diff --git a/java-virtuals/javamail/javamail-1.0-r4.ebuild b/java-virtuals/javamail/javamail-1.0-r4.ebuild
index 1027231d6226..497ea03ceede 100644
--- a/java-virtuals/javamail/javamail-1.0-r4.ebuild
+++ b/java-virtuals/javamail/javamail-1.0-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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 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"
+KEYWORDS="amd64 ~arm ppc64 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"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/java-virtuals/jaxp-virtual/jaxp-virtual-1.4-r1.ebuild b/java-virtuals/jaxp-virtual/jaxp-virtual-1.4-r1.ebuild
index 5d91f30b7d41..d842bdbfdae4 100644
--- a/java-virtuals/jaxp-virtual/jaxp-virtual-1.4-r1.ebuild
+++ b/java-virtuals/jaxp-virtual/jaxp-virtual-1.4-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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
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 711a6c72ff4b..f1b585164ec0 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 ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/java-virtuals/jms/jms-1.1.ebuild b/java-virtuals/jms/jms-1.1.ebuild
index 3086f142a375..3fdfdd02ab3e 100644
--- a/java-virtuals/jms/jms-1.1.ebuild
+++ b/java-virtuals/jms/jms-1.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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/java-virtuals/jmx/jmx-1.0-r4.ebuild b/java-virtuals/jmx/jmx-1.0-r4.ebuild
index 662640aad33e..42196d9cccce 100644
--- a/java-virtuals/jmx/jmx-1.0-r4.ebuild
+++ b/java-virtuals/jmx/jmx-1.0-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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild b/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild
index ac14f8727ab8..5890ff61a4c4 100644
--- a/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild
+++ b/java-virtuals/saaj-api/saaj-api-1.3-r3.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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/java-virtuals/script-api/script-api-1.0-r1.ebuild b/java-virtuals/script-api/script-api-1.0-r1.ebuild
index 776ea984b39f..5ca22e4d097a 100644
--- a/java-virtuals/script-api/script-api-1.0-r1.ebuild
+++ b/java-virtuals/script-api/script-api-1.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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc ~ppc"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/java-virtuals/servlet-api/servlet-api-2.2.ebuild b/java-virtuals/servlet-api/servlet-api-2.2.ebuild
index a820191a9d7a..6e0dbe1afc9e 100644
--- a/java-virtuals/servlet-api/servlet-api-2.2.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.3.ebuild b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
index e3cd41325c1e..08571b535154 100644
--- a/java-virtuals/servlet-api/servlet-api-2.3.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS=" amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.4.ebuild b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
index 7ed78d0340f8..6420e25cb978 100644
--- a/java-virtuals/servlet-api/servlet-api-2.4.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.4.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=""
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild b/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
index 771212b934da..6cae33087915 100644
--- a/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
index 3a0109cea110..6a39c486d3b9 100644
--- a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-3.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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS=" amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/java-virtuals/servlet-api/servlet-api-3.1.ebuild b/java-virtuals/servlet-api/servlet-api-3.1.ebuild
index 334cac99605b..245e25cada32 100644
--- a/java-virtuals/servlet-api/servlet-api-3.1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/java-virtuals/stax-api/stax-api-1-r4.ebuild b/java-virtuals/stax-api/stax-api-1-r4.ebuild
index 64c2c91f74a5..dc9378148732 100644
--- a/java-virtuals/stax-api/stax-api-1-r4.ebuild
+++ b/java-virtuals/stax-api/stax-api-1-r4.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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/java-virtuals/transaction-api/transaction-api-1.1.ebuild b/java-virtuals/transaction-api/transaction-api-1.1.ebuild
index b880714a341e..fe80296cd469 100644
--- a/java-virtuals/transaction-api/transaction-api-1.1.ebuild
+++ b/java-virtuals/transaction-api/transaction-api-1.1.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$
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild
new file mode 100644
index 000000000000..8ffe9dc2d38d
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.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 kde5-meta-pkg
+
+DESCRIPTION="Meta package for the KDE Applications collection"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="accessibility minimal nls pim sdk"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+# KDE PIM 15.08.3 is not going to be in tree and
+# will conflict with other packages from 15.08.3
+# Raise kdeedu-meta dep whenever it hits portage
+RDEPEND="
+	$(add_kdeapps_dep kate)
+	$(add_kdeapps_dep kdeadmin-meta)
+	$(add_kdeapps_dep kdebase-meta)
+	$(add_kdeapps_dep kdeedu-meta '' 4.14.3)
+	$(add_kdeapps_dep kdegames-meta)
+	$(add_kdeapps_dep kdegraphics-meta)
+	$(add_kdeapps_dep kdemultimedia-meta)
+	$(add_kdeapps_dep kdenetwork-meta)
+	$(add_kdeapps_dep kdetoys-meta)
+	$(add_kdeapps_dep kdeutils-meta)
+	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
+	nls? (
+		$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
+		$(add_kdeapps_dep kde4-l10n 'minimal' ${L10N_MINIMAL})
+	)
+	pim? ( >=kde-apps/kdepim-meta-4.4.2015:4 )
+	sdk? (
+		$(add_kdeapps_dep kdesdk-meta)
+		$(add_kdeapps_dep kdewebdev-meta)
+	)
+	!minimal? ( $(add_kdeapps_dep kdeartwork-meta 'minimal') )
+"
diff --git a/kde-apps/kde-apps-meta/metadata.xml b/kde-apps/kde-apps-meta/metadata.xml
new file mode 100644
index 000000000000..e40177eace7a
--- /dev/null
+++ b/kde-apps/kde-apps-meta/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="pim">Pull in KDE PIM suite</flag>
+		<flag name="sdk">Pull in developer-specific meta-packages</flag>
+	</use>
+</pkgmetadata>
diff --git a/kde-apps/kde-meta/kde-meta-15.08.3.ebuild b/kde-apps/kde-meta/kde-meta-15.08.3.ebuild
new file mode 100644
index 000000000000..9484ffe7217a
--- /dev/null
+++ b/kde-apps/kde-meta/kde-meta-15.08.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kde-apps-meta)
+	$(add_plasma_dep plasma-meta)
+"
diff --git a/kde-base/kde-meta/kde-meta-4.14.3-r1.ebuild b/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
index d4f4bf680487..4301557edcfd 100644
--- a/kde-base/kde-meta/kde-meta-4.14.3-r1.ebuild
+++ b/kde-apps/kde-meta/kde-meta-4.14.3-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$
 
diff --git a/kde-base/kde-meta/kde-meta-4.14.3.ebuild b/kde-apps/kde-meta/kde-meta-4.14.3.ebuild
index 397081d1d9a9..784e575555a0 100644
--- a/kde-base/kde-meta/kde-meta-4.14.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-4.14.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$
 
diff --git a/kde-base/kde-meta/metadata.xml b/kde-apps/kde-meta/metadata.xml
index 1c740394ada0..1c740394ada0 100644
--- a/kde-base/kde-meta/metadata.xml
+++ b/kde-apps/kde-meta/metadata.xml
diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
index 552c0005e9c5..3be80f18a3cb 100644
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-wallpapers"
 inherit kde4-base
 
 DESCRIPTION="KDE wallpapers"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+minimal"
 
 src_configure() {
diff --git a/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild b/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild
index 1b198d8a4490..026703a5489e 100644
--- a/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild
@@ -13,8 +13,8 @@ IUSE="+wallpapers"
 KEYWORDS=" ~amd64 ~x86"
 
 RDEPEND="
-	wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-15.08.0:5 ) )
 	x11-themes/hicolor-icon-theme
+	wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) kde-apps/kde-wallpapers:5 ) )
 "
 
 KMEXTRA="
diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild
new file mode 100644
index 000000000000..5aced72979a0
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+KEYWORDS="~amd64 ~x86"
+IUSE="+display-manager minimal +wallpapers"
+
+RDEPEND="
+	$(add_kdeapps_dep dolphin)
+	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep kwrite)
+	$(add_plasma_dep plasma-meta)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
+	!minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') )
+	!prefix? ( display-manager? ( || ( x11-misc/lightdm x11-misc/sddm ) ) )
+"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
index ab584e62e6b2..75781dc786a0 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-4.14.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$
 
@@ -25,7 +25,7 @@ RDEPEND="
 	$(add_kdeapps_dep libkonq)
 	$(add_kdeapps_dep nsplugins)
 	$(add_kdeapps_dep phonon-kde)
-	wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) kde-apps/kde-wallpapers:5 ) )
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
 	!minimal? (
 		$(add_kdebase_dep freespacenotifier '' 4.11)
 		$(add_kdebase_dep kcheckpass '' 4.11.22-r1)
diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index 729f4b3a0fb1..0f092fdcc60b 100644
--- a/kde-apps/kdebase-meta/metadata.xml
+++ b/kde-apps/kdebase-meta/metadata.xml
@@ -4,6 +4,7 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="display-manager">Pull in a graphical display manager</flag>
+		<flag name="minimal">Disable install of various KDE SC 4 based packages</flag>
 		<flag name="wallpapers">Install the KDE wallpapers</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.3-r1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.3-r1.ebuild
new file mode 100644
index 000000000000..69d1ebd318ba
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="ppp"
+
+# FIXME: Add back when ready
+# $(add_kdeapps_dep plasma-telepathy-meta)
+RDEPEND="
+	$(add_kdeapps_dep kdenetwork-filesharing)
+	$(add_kdeapps_dep kget)
+	$(add_kdeapps_dep kopete)
+	$(add_kdeapps_dep krdc)
+	$(add_kdeapps_dep krfb)
+	$(add_kdeapps_dep zeroconf-ioslave)
+	ppp? ( $(add_kdeapps_dep kppp) )
+"
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
index dab7cbeffff5..273f2f7eeb5f 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
@@ -17,7 +17,6 @@ IUSE="+wallpapers"
 RDEPEND="
 	$(add_kdebase_dep kcminit)
 	$(add_kdeapps_dep kdebase-runtime-meta)
-	wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) kde-apps/kde-wallpapers:5 ) )
 	$(add_kdeapps_dep kfmclient)
 	$(add_kdeapps_dep knotify)
 	$(add_kdeapps_dep kreadconfig)
@@ -37,6 +36,7 @@ RDEPEND="
 	x11-apps/xrdb
 	x11-apps/xsetroot
 	x11-apps/xset
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
 "
 
 KMEXTRACTONLY="
diff --git a/kde-base/krossjava/krossjava-4.14.3.ebuild b/kde-base/krossjava/krossjava-4.14.3.ebuild
index ca5cd023a302..9f00d49769c9 100644
--- a/kde-base/krossjava/krossjava-4.14.3.ebuild
+++ b/kde-base/krossjava/krossjava-4.14.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$
 
@@ -9,7 +9,7 @@ KMMODULE="java"
 inherit java-pkg-2 java-ant-2 kde4-meta multilib
 
 DESCRIPTION="Java plugin for the kdelibs/kross scripting framework"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/mail-client/roundcube/roundcube-1.1.4.ebuild b/mail-client/roundcube/roundcube-1.1.4.ebuild
index f5a9e432d864..a314e23de0eb 100644
--- a/mail-client/roundcube/roundcube-1.1.4.ebuild
+++ b/mail-client/roundcube/roundcube-1.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~hppa ppc ~ppc64 ~sparc ~x86"
 
 IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 00cc4f71600c..030160ca0151 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,4 +1,2 @@
 DIST cantarell-fonts-0.0.18.1.tar.xz 289248 SHA256 9c5b1a2edee1d3acf30eaae3d559b2b2e1d835249cf2770f6f8bfc6af861e8f0 SHA512 eeabffc1f51f1c5423c7eba29b9dd47b4e7595146a1f380bd2742ee692a95fafb159e5f0d67c2b8864da23d277a782eeb65939a3fb82f70b09d0c89d38663f7d WHIRLPOOL 5a610d9be666fa7b4aac9edebdbe6bd71c1d948fbdb4556dff8f4635db8298d7bf11b6d0d02f4a5a112e1653c3d32d14ab5756a2614879c815dc8694f77ed3bd
-DIST cantarell-fonts-0.0.19.tar.xz 386692 SHA256 c7f975ef3d5cf0ed409636c59d069260783683c47ba1289ac3e66a98446e46ae SHA512 52042a48a7fe36b3281006a56c4f8ccc98032e85776867fde803b593baabfdf80ff04173d983227964c185caa0949b2947e2dbbd4d4cf36116b52ba95ef8b7c7 WHIRLPOOL bd1de994ffe83544513d580cf4300fcd66a4fca6e2e8489e5383beac68920c48d01df682ad3adc691ba0b515fc25d556dfa9e8ba786226f4b3db5288a188dbd9
-DIST cantarell-fonts-0.0.20.1.tar.xz 353144 SHA256 0f933516f3270fb7307d9c2e26e4703b403608c5cc9da3127cba4395bcd4ec91 SHA512 b77b0eb34c68e0de916a55517835c807ea2ca2ca9ea94956f08a1381e4d957f2ab4ddf0f2930de35a4635cc1da1ed9108f0183691c278692226a1a6961971772 WHIRLPOOL b8f0293d106856c2ba6bfaff3f53b991c12d9dc4299424c54c50bf0d8839b3603985db7486932735177c7713569b13210d77843fa7133987ab8ccc001a798a15
-DIST cantarell-fonts-0.0.20.tar.xz 351660 SHA256 fb78a5cb6bdcfc464b763a030186c818080860107283bff8adcbb2d084f8f8de SHA512 fa6c993523e1079da2f53f215fe26777193180bddf3bdfcdbfb79ec83954ac54dd7c460df9d6d6eed043f37b5bbf18f12d56b03b3d7f56a102768072dc92b1b5 WHIRLPOOL 132c5641ff2b87d6e2a277af624d76d2141d210b0b92ccd55cbef85664bd83aad8e8d96bff17a630c6d66482e9aa3fa1022879cf89e7bba1963febf176c264a1
+DIST cantarell-fonts-0.0.21.tar.xz 359408 SHA256 2d3e925574648f0902c61975f84acac445ee9cda826280644bdf772960b46e85 SHA512 4c22123ff6aeb1d7325ef8933c86778f6df9fac370a415028cc45a193051454b06cf32673d872b9fc6c55c0000923221c7501348bea8606b247deb3f997f820a WHIRLPOOL 0a937eaacfa027aaab421ba89e569cfb4e750e8d83589d8ff0d732608dccb18ec472ee12fc17e06bb15e918337eb7580eae8a63cc17d25c19ddebe9f312589b2
diff --git a/media-fonts/cantarell/cantarell-0.0.19.ebuild b/media-fonts/cantarell/cantarell-0.0.19.ebuild
deleted file mode 100644
index ef8eba89faf7..000000000000
--- a/media-fonts/cantarell/cantarell-0.0.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 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/cantarell/cantarell-0.0.20.ebuild b/media-fonts/cantarell/cantarell-0.0.20.ebuild
deleted file mode 100644
index 45f7fb71242d..000000000000
--- a/media-fonts/cantarell/cantarell-0.0.20.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/cantarell/cantarell-0.0.20.1.ebuild b/media-fonts/cantarell/cantarell-0.0.21.ebuild
index 45f7fb71242d..45f7fb71242d 100644
--- a/media-fonts/cantarell/cantarell-0.0.20.1.ebuild
+++ b/media-fonts/cantarell/cantarell-0.0.21.ebuild
diff --git a/media-gfx/aoi/aoi-2.5.ebuild b/media-gfx/aoi/aoi-2.5.ebuild
index 9873f952a9ca..a038aaf7e996 100644
--- a/media-gfx/aoi/aoi-2.5.ebuild
+++ b/media-gfx/aoi/aoi-2.5.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$
 
@@ -11,7 +11,7 @@ DESCRIPTION="A free, open-source 3D modelling and rendering studio"
 SRC_URI="mirror://sourceforge/aoi/${MY_P}.zip
 	doc? ( mirror://sourceforge/aoi/manual${MY_MANUAL_V}.zip )"
 HOMEPAGE="http://aoi.sourceforge.net/index"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 x86"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="app-arch/unzip"
diff --git a/media-gfx/aoi/aoi-2.7.2.ebuild b/media-gfx/aoi/aoi-2.7.2.ebuild
index b8c8d069543c..0141a5bf375b 100644
--- a/media-gfx/aoi/aoi-2.7.2.ebuild
+++ b/media-gfx/aoi/aoi-2.7.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$
 
@@ -12,7 +12,7 @@ DESCRIPTION="A free, open-source 3D modelling and rendering studio"
 SRC_URI="mirror://sourceforge/aoi/${MY_P}.zip
 	doc? ( mirror://sourceforge/aoi/manual${MY_MANUAL_V}.zip )"
 HOMEPAGE="http://aoi.sourceforge.net/index"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="app-arch/unzip"
diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-9999.ebuild
index 680e5beb4a66..19fe1f6cfd3b 100644
--- a/media-gfx/farbfeld/farbfeld-9999.ebuild
+++ b/media-gfx/farbfeld/farbfeld-9999.ebuild
@@ -16,6 +16,7 @@ KEYWORDS=""
 RDEPEND="
 	media-libs/libjpeg-turbo
 	media-libs/libpng:*
+	media-libs/lcms:2
 "
 DEPEND="
 	${RDEPEND}
diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
index 515fba62c264..7ef19f84dcff 100644
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 0c19aefc525c..cca96b333521 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1 +1,2 @@
 DIST kxstitch-1.2.0.tar.bz2 1995295 SHA256 12946cdba1278bc68d3ca11c0db1963dbe3363d0f6aa814cb9e8d6e49f5132da SHA512 bd1bf32cb1cf188e03c17ddc3f3aa9e19e5551f0f3c58afa7951975b9a149f164b6d19f6c9011770c8d40724b9056c8d42202a4bd8712dda995439159c84c5f5 WHIRLPOOL b19a595f4a1fe08707d8ce122beae169ed8607ca81286d0d63359ff79aef10f446f3b23a3fb9f40dfaa455f879011f78138c516704e961c3901c76eb88b56992
+DIST kxstitch-1.3.0.tar.bz2 1982487 SHA256 675fdcf0d7c171c8b41c8156143530a981a707c705e45663e70946ca4e707f16 SHA512 f1a422b9f5e6850e1864b1c54c2af732d53af07d5b310241446e7cae810cfc0f97cfe99792ae3fb9e7ddf9efd5203fc8bede132a2a9c8b3be5057b4d338d4cda WHIRLPOOL 75f6b9ab6638bf9e7960d55ca291d28c6bf814fb799b345f4c08b6072c702f6ed3889c0d4c53889493b5c5c29b6efa5253bf8d7089e33b6cf56f0dc13becf0a4
diff --git a/media-gfx/kxstitch/kxstitch-1.3.0.ebuild b/media-gfx/kxstitch/kxstitch-1.3.0.ebuild
new file mode 100644
index 000000000000..e09091cf3e6a
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-1.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOC_DIRS="doc-translations/%lingua_${PN}"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="bs ca ca@valencia cs da de en_GB es et fr hu it ja lt nl pl pt pt_BR sk sv tr uk"
+inherit kde4-base
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	media-gfx/imagemagick[cxx]
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/media-gfx/opcion/opcion-1.1.1-r2.ebuild b/media-gfx/opcion/opcion-1.1.1-r2.ebuild
index babe77b7fa4e..4a55a1382dc7 100644
--- a/media-gfx/opcion/opcion-1.1.1-r2.ebuild
+++ b/media-gfx/opcion/opcion-1.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://opcion.sourceforge.net/"
 SRC_URI="mirror://sourceforge/opcion/${MY_P}_src.zip"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 COMMON_DEP="=dev-java/jgoodies-looks-1.2*"
 RDEPEND=">=virtual/jre-1.4
diff --git a/media-gfx/povtree/povtree-1.5-r1.ebuild b/media-gfx/povtree/povtree-1.5-r1.ebuild
index 9326d2fbec7d..d9d399489449 100644
--- a/media-gfx/povtree/povtree-1.5-r1.ebuild
+++ b/media-gfx/povtree/povtree-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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://propro.ru/go/Wshop/povtree/${MY_P}.zip"
 # Free for non-commercial use, according to e-mail from authors #446168
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND=">=virtual/jre-1.3"
 DEPEND="app-arch/unzip"
diff --git a/media-libs/gd/gd-2.1.1-r1.ebuild b/media-libs/gd/gd-2.1.1-r1.ebuild
index c65c663af449..d124e6d29e83 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 truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r3.ebuild
index ca74fa2ed3b4..de4e811c2ce4 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://gstreamer.freedesktop.org/"
 SRC_URI+=" https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-h264-patches.tar.xz"
 
 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="+orc"
 
 RDEPEND="
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 4a29ce8ae317..450b8af90284 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -2,4 +2,5 @@ DIST jpeg-6b-patchset-1.tar.xz 2592 SHA256 533ef36e4ca8cdad81d0c931e486776983f60
 DIST jpegsrc.v6b.tar.gz 613261 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe WHIRLPOOL ab649fd5ff29dfbcdf52f337b73c65e29d577c3fd0a1c910590177d83985115c8e8e4c392e196f7a497d6346072b40053999171f0cd74ee3325e74c005c5ba9b
 DIST jpegsrc.v8d.tar.gz 991456 SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753 WHIRLPOOL 7489605809b43cfac02230b89013075806df32246b37eb12ac05ef890ee690f85744887e296f5a21fa64012570aa298d2aa54e4469066f4c21dd40141f3bd8a8
 DIST jpegsrc.v9a.tar.gz 1000034 SHA256 3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 SHA512 9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b WHIRLPOOL cd92fd028c8f55c653d74ee74d0c744ebded578bdc7f415a5e8321bed638300c908d08e4129ebb031a6ed19560a2610942ed23cb0a075cc1a34319b9ebaa2265
+DIST jpegsrc.v9b.tar.gz 1022609 SHA256 240fd398da741669bf3c90366f58452ea59041cacc741a489b99f2f6a0bad052 SHA512 74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c WHIRLPOOL ccf5a7cd3566a61d85c870cd562d81b20877f338b8158c4b2000f08a3b7b47a0f59b0b3b8d5839baadd9f0104e88ed8d789963d4dc622594f42d90b2a3a8ad42
 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
diff --git a/media-libs/jpeg/jpeg-9b.ebuild b/media-libs/jpeg/jpeg-9b.ebuild
new file mode 100644
index 000000000000..f57f08f1d96e
--- /dev/null
+++ b/media-libs/jpeg/jpeg-9b.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 eutils libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
+HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
+SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
+	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
+
+LICENSE="IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="!media-libs/libjpeg-turbo:0
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
+	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
+	local ldverscript=
+	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--enable-maxmem=64 \
+		${ldverscript}
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi; then
+		# Build exifautotran and jpegexiforient
+		cd ../debian/extra
+		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	dodoc change.log example.c README *.txt
+
+	# Install exifautotran and jpegexiforient
+	newdoc ../debian/changelog changelog.debian
+	cd ../debian/extra
+	emake \
+		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+		install
+	# Remove +x bits from man pages.
+	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
+}
diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 5e99ee04bf68..3b7ff1845808 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,2 +1 @@
-DIST liblastfm-1.0.8.tar.gz 119186 SHA256 e36f4f83428ede7021187fe6042db5a1919a579b071a75420364ef7115434607 SHA512 afeea48e4b859a0ce126889258b1f8b9a33224595c8b1d3f791559f854c0f895a0eb6dc5e6295bd5f0fe44d2a706b4b2602d5810d446d588db721f9c2b22af29 WHIRLPOOL b4ec8ed1d3f392a38d82c6a10d100032a62d35e316ad6a5f00b3f7b2e61d81030104ce4eafe8010329b91a81daeca68b89c78996d3ee8d3e586e9df3be74d2b4
 DIST liblastfm-1.0.9.tar.gz 119320 SHA256 5276b5fe00932479ce6fe370ba3213f3ab842d70a7d55e4bead6e26738425f7b SHA512 9d2bcf71b26d8a95920a07649c97b3faa071c49a8269268bb08fab01537392774873233d03cada09d3ce3fe2c45b0affdb74cd27c41f69342b973896effe1018 WHIRLPOOL 491b50ec174d0a344221f12da9c783cfe56fffa99bfe3b84d835a70a510a3157dfecc62f2fff086cd570fb7281ecefe2b05c6982336f27ca6c1db6ccc4bd55dc
diff --git a/media-libs/liblastfm/liblastfm-1.0.8.ebuild b/media-libs/liblastfm/liblastfm-1.0.8.ebuild
deleted file mode 100644
index 066de33a4e63..000000000000
--- a/media-libs/liblastfm/liblastfm-1.0.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-QT_MINIMAL="4.8.0"
-inherit cmake-utils
-
-DESCRIPTION="A Qt C++ library for the Last.fm webservices"
-HOMEPAGE="https://github.com/lastfm/liblastfm"
-SRC_URI="https://github.com/lastfm/liblastfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="fingerprint test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtcore-${QT_MINIMAL}:4
-	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	fingerprint? (
-		media-libs/libsamplerate
-		sci-libs/fftw:3.0
-		>=dev-qt/qtsql-${QT_MINIMAL}:4
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qttest-${QT_MINIMAL}:4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/lastfmlib-0.4.0
-"
-
-# 1 of 2 is failing, last checked version 1.0.7
-RESTRICT="test"
-
-src_configure() {
-	# demos not working
-	# qt5 support broken
-	local mycmakeargs=(
-		-DBUILD_DEMOS=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
-		-DBUILD_WITH_QT4=ON
-		$(cmake-utils_use_build fingerprint)
-		$(cmake-utils_use_build test TESTS)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/liblastfm/liblastfm-1.0.9.ebuild b/media-libs/liblastfm/liblastfm-1.0.9.ebuild
index e1539ca5fd65..ee7c9cd118ce 100644
--- a/media-libs/liblastfm/liblastfm-1.0.9.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.0.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/lastfm/liblastfm"
 SRC_URI="https://github.com/lastfm/liblastfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0/0"
 IUSE="fingerprint test +qt4 qt5"
 
diff --git a/media-libs/liblastfm/metadata.xml b/media-libs/liblastfm/metadata.xml
index b0a55507f566..c33c1c76a319 100644
--- a/media-libs/liblastfm/metadata.xml
+++ b/media-libs/liblastfm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <use>
-    <flag name="fingerprint">Build the lastfm-fingerprint library</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">lastfm/liblastfm</remote-id>
-  </upstream>
+	<herd>kde</herd>
+	<use>
+		<flag name="fingerprint">Build the lastfm-fingerprint library</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">lastfm/liblastfm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 26bcdd9ba03f..01eee458e886 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,13 +1,11 @@
-DIST libpng-1.2.51.tar.xz 562940 SHA256 c7d7b813b022afd70474f78bcc3655c7bb54edbf28dd4652e5521cbb6da56d4a SHA512 63ba0df5eff78b254d53f6cfd4075d3ea93ee9445e37678fc7d29fa116137b2a7c441eda23851638f9185166e408f42c51d0678c466c8376a1de356c7db760f2 WHIRLPOOL d829b07e950c64a8de37591ac5d40211f8e762feff8ff6f98db35714293997304b3eb063ea69a87064e6c66530a4fa2531dadcb1a0bb412066c558a5ff2f679c
-DIST libpng-1.2.54.tar.xz 571448 SHA256 cf85516482780f2bc2c5b5073902f12b1519019d47bf473326c2018bdff1d272 SHA512 3fde161bae1c61c0c099344518a59a312ac5bcd6063d7d01be156fd4e048fdaafed8a27e10bf2750d4ef678389e2782137c9e6540b7fd0859b820bb8d9443497 WHIRLPOOL fd985ebc9982e20ec37b9a8889890406a334005648f90e429e71eae02c7308c8d64ff0f34e5a31fc817521d44a45f0740bc221bf73c00ade1ef2e2974fd22b9d
-DIST libpng-1.2.55.tar.xz 655728 SHA256 5e5227345676fabbba28558f4396514bb06a239eaf69adba12f3669a1650797e SHA512 d0bc9ebbbcff1c258c333d9ca64c15074d0e01df49b1d937242509b42307aebe22169ae322aa75dc6c60c0c31d29318d184ef8b1b87ae2c9e4d3d4f4c8a4dd45 WHIRLPOOL 49c2c3dcd142c5fd377a99495d74950440f4f662af9bf246570d0e99425f2b977c5b1b6b7f407dbc2efef0f93ffb5e1d7c3c25d9ef1dfaeab8ab2f0744e5427b
-DIST libpng-1.5.24-apng.patch.gz 10318 SHA256 7493734793803598a57f83274258118e9a31f6ec9a20b83a4d851cf359ed966a SHA512 647bb8a780947b72c7aad1ffc2b2114ed43f22e6c3885621c83694875bcec4516e49b00856fabffd568bfed90748e96117d42e3817e83a25fcb25089e32225ea WHIRLPOOL 38e6616930865bdaf8fa1ecf35bb8af8916f8bc3a9af9e9621455e378d7913b393f8ab3dd823bcc811974021dfdc24f5da95bfb14c3249cf67dc31fe037f80af
-DIST libpng-1.5.24.tar.xz 749016 SHA256 b92e3474f3136b5d9443ba92822154ebc2573fc6feead90d364ee9ebc3741be2 SHA512 d6faaba4844de0fbb0786e141265a17128387dd73dfdb5cbd1ab2915430578cd73f3f5efadcaaab966429f1a4908568b60829db63b00aadb320bf0f4a8ff9e78 WHIRLPOOL 14631ce41756faf2ec00315d7279a39fd06b488288db24a1d81345ec484a7289d187a579823b1be471e975041d5a1b4f0fbdc763a1a64cfdc29dd4ca71cc789a
-DIST libpng-1.5.25-apng.patch.gz 10305 SHA256 32c706498b9edde98b8b55374c2188b0d1dce6b60048b167a6d99f97bef2595f SHA512 602998b5e922cf1e547c5dad79a2a4f2ae81a86f7a3f4693e09e118417508629d66b734317a842d43ac13f213f79ef24a264d6790514d3383cd32eaf40a12b9b WHIRLPOOL 8b2a24181c3c1b47a408283febf5d69cf485cd0665e26721d34873fce2bfb462383e3b40d51edcbfd62308241b1567aa5b4aa649d6343653162047bbba964116
-DIST libpng-1.5.25.tar.xz 748268 SHA256 1224db3a8df90ce1b07ee67327e6846484450d05b9315a1d56fcc9772c0a51ca SHA512 41663d277a4a0e59c0a797e34c9cbe17990333b3a93c008fbf449274053847d157ea12b2e93e941661e3921a0c202c395ba334474dd77b7f4d8dd85a76628a48 WHIRLPOOL 60afcc4f08855724f11a5ce146c40852b593f4fa3fb6eb2dcee129e59160f5e1fe572842f13434edb849d5f32f72ab02c031c66636585104c966107d57f666c5
+DIST libpng-1.2.56.tar.xz 654688 SHA256 24ce54581468b937734a6ecc86f7e121bc46a90d76a0d948dca08f32ee000dbe SHA512 b50cd58246590267fb123d8618387897d438cdc9514e69ca346bd09c5013845d2ca35933b236b31af9d81ae738afa7b01e9a332bcf099f4fa0e3b85048a4ac5f WHIRLPOOL 436209348dde13751e8c326b8a9bceacca281e3d59e548af7eb9246fb14ee2f657e3c10437f04148a0c244f2d3bc231260fb57a2cd145d87b5d07ef5e49a8b1d
+DIST libpng-1.5.26-apng.patch.gz 10318 SHA256 bcc0d7f1154a5004610a9102f25ce6f35985a6033cfb52887f3f2b11017fcd45 SHA512 f7e5228fab036e63be3de58f2f85041d834e2292d04682f0b20930d5cd58c078796a8c3d6742cd28c7dc808ac641aa5d5bfe6f8daee5fb2b0b75bfb856170861 WHIRLPOOL 449212c403b6e8c5724e402655b42d23ed3e27d3902b219767b663fab08dedc19e684497a1be4326a99ef4b8cc26eb6acdd1ed1b0ccc0c282f19a50b1c831d28
+DIST libpng-1.5.26.tar.xz 748164 SHA256 7ba4d85efb79e60d7a8a84bca6a0b925e043bfb5c8a47a1b878ab4d3bcd6714d SHA512 87214671af84665277f0ac3226e6feb41a3e1deb0d7d61e62c99e77d1386fcf928b21f9863c4166a7391230166190bad00e57c3fc42902b3a0a53ba68d4db1f5 WHIRLPOOL e2eda0792fc5f6b41d4f5d878fdf4c8bde0cac2591647a092fed0e6f362fd9c532d265ca7dcdcd8ade9bc23fa385bfa71bd8b532e3d1091202583230a9306724
 DIST libpng-1.6.18-apng.patch.gz 9940 SHA256 1d595b3b33c09529dddf869ca69f386528dfe1b991d2679377082e2acbca7009 SHA512 ebf8e2d11b18afc0943502be069076fbe07792e8056058551de0b1cf07987a6cf423edaa5de7aefb318115054235d984059a83aad93b06bed1a56002a0b6bd9b WHIRLPOOL d177ef6a4846956e8a2768b5beb5e18a6e9db2d03ef32e6ff21f79994f8274175b8bba01def0f85af4cd6640050173291e7a54c148076cbb8397e886257f83b8
 DIST libpng-1.6.18.tar.xz 932324 SHA256 2e10c13b7949883ac961db6177c516d778184432d440317e9f0391305c360963 SHA512 7ae286f728844da31699c3097cfb2167d4a57f740c749f0251de86ae481824716b3edaafc1b5673116623e729396ccc720a346439d3b20c5b6a7b06e1d129f74 WHIRLPOOL 1f9662073172eb2fa11924f79efd4d7dd0979696359f48f67addf5325148d898982d361879892acaa60441dd4fe42cd38ae68affc08302fa5ffc2b6731731a88
 DIST libpng-1.6.19-apng.patch.gz 10330 SHA256 5ec713a51c35c25d5e53dd61270a6fd5313b26872b382f0fbaed41a0743768a2 SHA512 2d412a74d657d366d395d13bc301d71363011fbcafbbf815dba565baca4069629450a97dfaab0ddeec7c7f646a6eddeac559d24f6910a34b072aa4a208dc4e16 WHIRLPOOL 4e093bcddbf114dda0c33eddac70b245f91c659f378d129731d3e486db3f6d232684bde1ad8f69109c7db726b53b8317f989d8b5c5a50198ab645eb7a869e7f9
 DIST libpng-1.6.19.tar.xz 941280 SHA256 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8 SHA512 166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8 WHIRLPOOL 8cdb5ffc7ecfafd064ae816b3bd1c7572799fc54c701e74d9c1f66ccac592fe460c1f22f1774329a8a1f177247f0fde8a22f8dc26892805a0bed64c0690967ae
 DIST libpng-1.6.20-apng.patch.gz 10304 SHA256 ed7bc9d03bc7390c477623e1abff42977395c75ed3e69e8308ea25bc3871774d SHA512 764bfb5a7cff395bbd6aeb6b5a53a9963f7074c41ae39dd9832d1dfd1e4eb0b6210d2cf9a1af63c8db8959ee4f0691d2fa288b0a0ecc63b61d131c7a708b38a4 WHIRLPOOL 8673db8f8b47704493d925d436f07822b3b92c0e251649670efe1f0db6cd4ecb9c38fd0c2d5153503c02f4afc677a25be835d12878ee0e0fbfa5a5027278e766
 DIST libpng-1.6.20.tar.xz 942672 SHA256 55c5959e9f3484d96141a3226c53bc9da42a4845e70879d3e1d6e94833d1918b SHA512 bbf7d9a21a13eb1fd1fa06f9761df72c0b37bd62da7049afe20ec4e63c02c3708aca8a2c2b7f2d7332f3941469b4aca1653cc8423c7fea6de8084201cb8b5f5f WHIRLPOOL fe745030bc7d09e41b20c11f26ed4b1ba1b49cd2f3d0bbafab181fbb28aa0a87165ef10f66d734314e7a73343d6c38bfedbe176fdc7b03c1273ec13d4f3f0953
+DIST libpng-1.6.21-apng.patch.gz 10318 SHA256 e3987bb341dc0e936f3a28fc555d5a46577f629c72a42287a1f3cbb204138d1a SHA512 196d2d7c8ea461cee1cfd8763763619f63469e1e017f76fe88879437475b936aeb593fce6df586f95203465e2f1026f23fe1a02f3d4fa45d427d5d206469c9d8 WHIRLPOOL bede3b8c379b21dfb74bb2f9e8e64151d8c579b174dfa0e42d0c4e2eaacf010860f1b2362d5c336c9919fc5849c05f05db5ccc03bf4afbcf1a4383b7f65c2e91
+DIST libpng-1.6.21.tar.xz 943980 SHA256 6c8f1849eb9264219bf5d703601e5abe92a58651ecae927a03d1a1aa15ee2083 SHA512 84f644d455cf90ad721a098fa9e0fcfa6df22a12625faad1c36bf2353ab2315040c7cbd05522c05937c3a31b1c9dd7821cbe29c4a5ba27dec3de92c81ef9ed32 WHIRLPOOL 0d227f13a2375f1e8aeedadab91eead0ab1de29e0e77814235de5866deb58914adea4e9ec74de6a5503282d0966afe5568a8298f75516f7cc431f9eb578dc480
diff --git a/media-libs/libpng/libpng-1.2.51.ebuild b/media-libs/libpng/libpng-1.2.51.ebuild
deleted file mode 100644
index 6ec9bd6c319d..000000000000
--- a/media-libs/libpng/libpng-1.2.51.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
-
-# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="libpng"
-SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.2*:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf --disable-static
-}
-
-multilib_src_compile() {
-	emake libpng12.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libpng12.so.0.* libpng12.so.0
-}
diff --git a/media-libs/libpng/libpng-1.2.55.ebuild b/media-libs/libpng/libpng-1.2.55.ebuild
deleted file mode 100644
index db9ef0f39ce9..000000000000
--- a/media-libs/libpng/libpng-1.2.55.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
-
-# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="libpng"
-SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.2*:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS=""
-
-src_prepare() {
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf --disable-static
-}
-
-multilib_src_compile() {
-	emake libpng12.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libpng12.so.0.* libpng12.so.0
-}
diff --git a/media-libs/libpng/libpng-1.2.54.ebuild b/media-libs/libpng/libpng-1.2.56.ebuild
index 626940c40d13..354bed5f3d06 100644
--- a/media-libs/libpng/libpng-1.2.54.ebuild
+++ b/media-libs/libpng/libpng-1.2.56.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="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.5.25.ebuild b/media-libs/libpng/libpng-1.5.25.ebuild
deleted file mode 100644
index f0df0eb92c19..000000000000
--- a/media-libs/libpng/libpng-1.5.25.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
-
-# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng"
-SLOT="1.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng neon"
-
-RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.5*:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS=""
-
-pkg_setup() {
-	local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
-	[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
-}
-
-src_prepare() {
-	if use apng; then
-		# fix windows path in patch file. Please check for each release if this can be removed again.
-		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
-			-i "${WORKDIR}"/${PN}-*-apng.patch || die
-		epatch "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-static \
-		--enable-arm-neon=$(usex neon)
-}
-
-multilib_src_compile() {
-	emake libpng15.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libpng15.so.15.* libpng15.so.15
-}
diff --git a/media-libs/libpng/libpng-1.5.24.ebuild b/media-libs/libpng/libpng-1.5.26.ebuild
index ca1aea0d41a1..288b529e9297 100644
--- a/media-libs/libpng/libpng-1.5.24.ebuild
+++ b/media-libs/libpng/libpng-1.5.26.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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.21.ebuild b/media-libs/libpng/libpng-1.6.21.ebuild
new file mode 100644
index 000000000000..b83049ccfb91
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.21.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	if use apng; then
+		epatch "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--enable-arm-neon=$(usex neon)
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+	prune_libtool_files --all
+}
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index e34fae269478..acef2f8b7059 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,3 +1,4 @@
 DIST opus-1.0.2.tar.gz 777306 SHA256 da615edbee5d019c1833071d69a4782c19f178cf9ca1401375036ecef25cd78a SHA512 73f089ac9c6fcf6adea6c862f6ac0e56712473f9dcaec3aec444a988ded1abcec7fa69da286af38500182dfaf96ba0b6ca52431c39ed08f2aa1caf84ffd43b39 WHIRLPOOL f953cc7f8bd4332524ee403e7dbd9647a29d324a30ef820e5b96a316366ab0a168f55e36a0ab5b239afe7f547874eb28aff1529e38774c1a880da1b7ce7daa86
 DIST opus-1.1.1.tar.gz 957948 SHA256 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e SHA512 1e55ed19f07ed399371aaf92544b3c5fb3d214c8ae67210a709edfede2102a5fa5c6f5b8287d26dcacad62b5c0a591bfe14ee7ae7d846629e5a814a05da4e149 WHIRLPOOL 35c20393f308beb56b07b722a78b82ad27d38095a0a4fcc5ad7d39f9dd99c9cae8e4646462faeb769c42e8286089e3d83d8f7cebc0362cdd9da7fb26da21b372
+DIST opus-1.1.2.tar.gz 959767 SHA256 0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd SHA512 12ec6613190a09bf6f300fac70bcf927731b707eae2511cebe7098cb49c4bf43dd21a0af4d22900958636949226df50243c432d53dedeacd46a4978729b5fc0d WHIRLPOOL 4de7a13a2102d2d8c9961af0dcc3d24a8b9f6a552bf5db93d7ffffb000a0a379f68407d0fc4576e84522442fbb5115419fd6a4c4dd9fab2b504de27ef3a3b1eb
 DIST opus-1.1.tar.gz 850208 SHA256 b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95 SHA512 b603efe66d65ef38dbcd0d2bbf213a1d15fa456aee00eca73e99abe4ec78668ed82e661ca7a69e9af4e0bc39e1aa76c4151b7f9840ff621ddcfd69f596cf2ba9 WHIRLPOOL 9d53e57d0c99b7e5e330822808f5b79e19bb3fbbffb9054e3d1d421b42fd70463d5fc39517eff1169d218bad8ab2440162c334ace013ffba846cbcfb57206201
diff --git a/media-libs/opus/opus-1.1.2.ebuild b/media-libs/opus/opus-1.1.2.ebuild
new file mode 100644
index 000000000000..39593d15ba21
--- /dev/null
+++ b/media-libs/opus/opus-1.1.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 autotools-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.opus-codec.org/opus.git"
+else
+	SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="Open versatile codec designed for interactive speech and audio transmission over the internet"
+HOMEPAGE="http://opus-codec.org/"
+SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+INTRINSIC_FLAGS="cpu_flags_x86_sse neon"
+IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+	)
+	for i in ${INTRINSIC_FLAGS} ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics )
+	done
+	autotools-multilib_src_configure
+}
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 a1acd9dacdb6..a0dc894fccdd 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/varconf/varconf-0.6.7-r1.ebuild b/media-libs/varconf/varconf-0.6.7-r1.ebuild
index d2bbbf737246..b21eac5778da 100644
--- a/media-libs/varconf/varconf-0.6.7-r1.ebuild
+++ b/media-libs/varconf/varconf-0.6.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libsigc++-2.0"
diff --git a/media-libs/virglrenderer/files/virglrenderer-0.2.0-libdrm.patch b/media-libs/virglrenderer/files/virglrenderer-0.2.0-libdrm.patch
new file mode 100644
index 000000000000..f1916728b408
--- /dev/null
+++ b/media-libs/virglrenderer/files/virglrenderer-0.2.0-libdrm.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/571124
+
+patch sent upstream
+
+From c78953320cae8b39869a8eae41fdec5c4ead30ae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 17 Jan 2016 23:50:21 -0500
+Subject: [PATCH] link libvirglrenderer against libdrm
+
+The library uses it (via drmPrimeHandleToFD) so link it in.
+
+URL: https://bugs.gentoo.org/571124
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 61cf879..09be3e9 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,6 @@
+ SUBDIRS := gallium/auxiliary
+ AM_LDFLAGS = -lgbm -lm -ldl -I./gallium/include \
++	$(LIBDRM_LIBS) \
+ 	$(EPOXY_LIBS) \
+ 	$(CODE_COVERAGE_LDFLAGS)
+ 
+-- 
+2.6.2
+
diff --git a/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
index c3ca5408fc70..507a47aaf4bd 100644
--- a/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit autotools
+inherit autotools eutils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://people.freedesktop.org/~airlied/virglrenderer"
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-libs/check-0.9.4 )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libdrm.patch #571124
 	[[ -e configure ]] || eautoreconf
 }
 
diff --git a/media-sound/dagrab/dagrab-0.513-r1.ebuild b/media-sound/dagrab/dagrab-0.513-r1.ebuild
new file mode 100644
index 000000000000..e901d83ba7b3
--- /dev/null
+++ b/media-sound/dagrab/dagrab-0.513-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_P="${PN}-S${PV}"
+DESCRIPTION="fixed point cd ripper"
+HOMEPAGE="http://vertigo.fme.vutbr.cz/~stibor/dagrab.html"
+SRC_URI="http://ashtray.jz.gts.cz/~smsti/archiv/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-freedb.patch"
+)
+
+src_prepare() {
+	# fix #570732 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+}
+
+src_install() {
+	dobin dagrab
+	dodoc BUGS CHANGES FAQ grab TODO
+	doman dagrab.1
+}
diff --git a/media-sound/dagrab/files/dagrab-0.513-freedb.patch b/media-sound/dagrab/files/dagrab-0.513-freedb.patch
index 6a65576497d8..5725867a26e0 100644
--- a/media-sound/dagrab/files/dagrab-0.513-freedb.patch
+++ b/media-sound/dagrab/files/dagrab-0.513-freedb.patch
@@ -1,5 +1,5 @@
---- dagrab.1
-+++ dagrab.1
+--- dagrab-S0.513/dagrab.1
++++ dagrab-S0.513/dagrab.1
 @@ -209,7 +209,7 @@
  .B -H
  .I [host][:port]
@@ -9,8 +9,8 @@
  .RE
  
  .B -D
---- const.h
-+++ const.h
+--- dagrab-S0.513/const.h
++++ dagrab-S0.513/const.h
 @@ -18,9 +18,9 @@
  #define BLEN		1024	/* length in chars of command/trackname */
  #define OVERLAP		1	/* minimum number of sectors for overlapping */
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch b/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
new file mode 100644
index 000000000000..82089f9553a5
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
@@ -0,0 +1,32 @@
+Fix linking failure due to different GCC5 inline semantics
+https://bugs.gentoo.org/show_bug.cgi?id=571000
+
+In addition, fix QA warnings caused by passing
+an unformatted string to printf().
+
+--- gbsplay-0.0.91/Makefile
++++ gbsplay-0.0.91/Makefile
+@@ -35,7 +35,7 @@
+ 	-predboolothers \
+ 	-shiftnegative \
+ 	-shiftimplementation
+-GBSCFLAGS  := -Wall -fsigned-char -D_FORTIFY_SOURCE=2
++GBSCFLAGS  := -Wall -fsigned-char -std=gnu89
+ GBSLDFLAGS := -Wl,-O1 -lm
+ GBSPLAYLDFLAGS :=
+ 
+--- gbsplay-0.0.91/plugout.c
++++ gbsplay-0.0.91/plugout.c
+@@ -55,10 +55,10 @@
+ {
+ 	long idx;
+ 
+-	printf(_("Available output plugins:\n\n"));
++	fputs(_("Available output plugins:\n\n"), stdout);
+ 
+ 	if (plugouts[0] == NULL) {
+-		printf(_("No output plugins available.\n\n"));
++		fputs(_("No output plugins available.\n\n"), stdout);
+ 		return;
+ 	}
+ 
diff --git a/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
new file mode 100644
index 000000000000..6e9a8663a802
--- /dev/null
+++ b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="de en"
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Nintendo Gameboy sound player for GBS format"
+HOMEPAGE="https://www.cgarbs.de/gbsplay.en.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa nas nls oss"
+
+RDEPEND="alsa? ( media-libs/alsa-lib:0 )
+	nas? ( media-libs/nas:0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext:0 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+	tc-export AR CC
+
+	# No econf, because "unknown option '--build=x86_64-pc-linux-gnu'"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} \
+		--without-xmmsplugin \
+		--without-test \
+		$(use_enable nls i18n) \
+		$(use_enable oss devdsp) \
+		$(use_enable alsa) \
+		$(use_enable nas) || die "Configure failed."
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SPLINT="true"
+}
+
+remove_disabled_locale() {
+	rm -r "${D}"/usr/share/locale/$1 || die
+}
+
+src_install() {
+	default
+
+	l10n_for_each_disabled_locale_do remove_disabled_locale
+}
diff --git a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
new file mode 100644
index 000000000000..70075baba0db
--- /dev/null
+++ b/media-sound/mp3diags/mp3diags-1.2.02-r1.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 gnome2-utils qmake-utils
+
+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="LGPL-3 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/boost-1.37
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:4
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	eqmake4 ${PN}.pro
+}
+
+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
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
index af7ef85a61e4..7a0d40c040e1 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/media-sound/protux/protux-0.50.100.ebuild b/media-sound/protux/protux-0.50.100.ebuild
index 5534c62283a7..d9bb7f506544 100644
--- a/media-sound/protux/protux-0.50.100.ebuild
+++ b/media-sound/protux/protux-0.50.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sourceforge.net/releases/${P}.tar.gz"
 IUSE="source"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 x86"
 
 DEPEND=">=virtual/jdk-1.5
 	source? ( app-arch/zip )"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 593a16fe27ff..e6555178e128 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,5 +1,5 @@
 DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
-DIST qmmp-0.9.3.tar.bz2 1113475 SHA256 5d8901d14066efaada789589aa64e28be0514c3226798d68a0b67750fea4c735 SHA512 8f023acd3906c382d9af78785944744449b3ff2155b8d697f2dc0074275d390a34eb1211b4f06f399fd391ed8891731e9db0f281c301037a561dd5021540f541 WHIRLPOOL 33eb797ddabb23f2033241df5b632c0f8c22773cc048d871a77b047784512fd5a34e8f831ebcad331f4c222f506ce5a5e1f49596ac74618398271b7b79c8833d
 DIST qmmp-0.9.5.tar.bz2 1121832 SHA256 628a017b2327437ff77ccf5b77b4756bd1e73186f030f4bb34b93c1135ea353e SHA512 21963852a10da4af88b7ab4050c86824e0f8d0f49ea5650f49b5794e6b34690b28724b292d8fb0828da44673201658d2441c8bd306bbdadf40cfa07076403d00 WHIRLPOOL 83dc441c089162dd9458b9dc5541ed47f76eafc7f3635d52a555c9624ef585e3570199cab30c81ab59fafd66c3048a3bb7f044a21061b2168e4f3d1a8e497c7b
-DIST qmmp-1.0.2.tar.bz2 1095127 SHA256 5c3e72f0effa2f2a5c7b41507d751599bf01d80316da6eaef7f2f20b91be8221 SHA512 44a485ac670943a1bfc89cc9d7e483c64e42e78a5e405bce26a0665b68080f4fede8224c5527b1679e5316bf77bf4eb6636b97fb59207ad7a50f0f903a5d0a27 WHIRLPOOL addbe0978926c19c8699238e940bad786f990b2985b53f3e8ac70310a664894631e84fae0d0facf80458ce3d6285a0c8851826d639dafa4b78550759dc849d57
+DIST qmmp-0.9.6.tar.bz2 1124762 SHA256 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b SHA512 92c240b163def08c9d68276384e34f916edfd7a9d0d2bdf0478f76c2da524119cfd20c5379329c75395f9930586b05f3c381f93328f6c50a4ea43ce106928578 WHIRLPOOL fb8db9d684e7a93923b34a8e6f2b34e4ad0716fe4b23d821440da80a5dfa06845be0808d61e541dc92751ebe58a631456369ff60db5f7e77fa9fe668521204b5
 DIST qmmp-1.0.4.tar.bz2 1102390 SHA256 9867fcb7ad7389f1c01d3bf31829fbe40a89eb8b05c104225257cea98c49ea85 SHA512 068e6de33af6675f326c90d3262bb350b0e513eb52f9ca1cdd680bf4562cc866516a34aa326ec3ad3a439c15727d902de7d80f7ba3d65e5a53f6b35be6dbadf2 WHIRLPOOL e2d7671fd27bd8adf447c972c467adc16adf5e91f71ad82e3d80fad15c7093a0c087bbf3644a6185f4b5dcbf296f928c94e1c5f089cd650eaf90f04258db1a23
+DIST qmmp-1.0.5.tar.bz2 1105704 SHA256 64952bfbe8b4bc6b74e04c4384fb923d0495f8380773ad7170b5a87fd2661ce1 SHA512 b4546457d3a4127a1911572233c367255fbbc6c08470bfb38b821062e516890186b6bd31960796bcb540b9c08610c9b9fcd193362d465dee9f722d431f70e699 WHIRLPOOL 28039c4b3cb16b3a7139534f37773081f96499eeb9b9f44b5f95bc010d290718d9f0a5cc7eb5b32565d16f7736e484053b4bd0ecb9d8eeeeb9734aeae8efea49
diff --git a/media-sound/qmmp/qmmp-0.9.3.ebuild b/media-sound/qmmp/qmmp-0.9.6.ebuild
index 5f82a4d0c164..d90953185b45 100644
--- a/media-sound/qmmp/qmmp-0.9.3.ebuild
+++ b/media-sound/qmmp/qmmp-0.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$
 
diff --git a/media-sound/qmmp/qmmp-1.0.2.ebuild b/media-sound/qmmp/qmmp-1.0.5.ebuild
index 4cba7f4c13a9..9eb2da36a388 100644
--- a/media-sound/qmmp/qmmp-1.0.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.0.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$
 
diff --git a/media-sound/quodlibet/quodlibet-3.5.1.ebuild b/media-sound/quodlibet/quodlibet-3.5.1.ebuild
index 3501610f54c7..2f90e18d2b90 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/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild
index 338a48b2bb88..695ae7760d17 100644
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild
@@ -21,11 +21,11 @@ REQUIRED_USE="|| ( alsa pulseaudio )"
 
 RDEPEND="
 	dev-libs/quazip:0/0[qt5]
-	>=dev-qt/qtcore-5.5
-	>=dev-qt/qtgui-5.5[accessibility]
-	>=dev-qt/qtnetwork-5.5
-	>=dev-qt/qtsql-5.5[sqlite]
-	>=dev-qt/qtwidgets-5.5
+	>=dev-qt/qtcore-5.5:5
+	>=dev-qt/qtgui-5.5:5[accessibility]
+	>=dev-qt/qtnetwork-5.5:5
+	>=dev-qt/qtsql-5.5:5[sqlite]
+	>=dev-qt/qtwidgets-5.5:5
 	sys-libs/glibc
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 83c8f7a88a63..139e91efd9a0 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,3 +5,4 @@ DIST ffmpeg-2.8.1.tar.bz2 8564488 SHA256 e2ed5ab28dee1af94336739173eb0019afc21a5
 DIST ffmpeg-2.8.2.tar.bz2 8573586 SHA256 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2 SHA512 15c1c09d7d4bb8cc7babff4c782e4bf6621ed86d6b02bffb5468bdcd294a1144bf56a8a758d2801200bb89c26ce8f5a086d818affb473364424f94f701cbf749 WHIRLPOOL 83ae9a00cba7bc906672f55d796b044d3f4baad9a56804f6482e7c27b9f526d1364dfddaa22ef32b921e5dcd0158222897935544a34c1d1e7c3b9d681067d2e0
 DIST ffmpeg-2.8.3.tar.bz2 8576798 SHA256 1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6 SHA512 aadfab7db84b85cbfe44a5c7b47e447a1711c3d78fa195f30d3f6644e95842c8d484172e4c98f75cbae5d3783f4dd2972a892123d9a9ff90be32db20b0dc8aa6 WHIRLPOOL c004fe02f300772b439ae070538d4ef4c5c514dd8a080de8e1a560597e79607b709319072f6120c35722481bc11f30077cc74a64800e390a7c5fabe82ded1718
 DIST ffmpeg-2.8.4.tar.bz2 8579383 SHA256 83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e SHA512 37f88c05fd0b8d1c4de83f5330f756cddd157ba78487d78436899d46a49a4e420eb086d263dd77c6c31a61c91f7839f40b07ed87817d686498b90caf9d870aa5 WHIRLPOOL 7e1a85a0eb00f33aad4d18b6a8d4d76c78aa0654c4ce10a864996239950fadd4a4995c481cd0e95a6f669c566cacd3da9ada4c66bb0fba011d4d942c8679eb99
+DIST ffmpeg-2.8.5.tar.bz2 8580755 SHA256 3b6d9951533323ee64a21d0aa7667a780b3470bfe4e0fb7c1b33307ce290615a SHA512 2a46bef5ac99d114be7d3ece561ae71d09b87eaecba5da3c02ff1fe7e5cf4913e1b6feecca405540d1d70f9126591c209055edd7df1ad1d8bbf02f107701929e WHIRLPOOL 59ef96e7536a098ccf42526f64173df750558d489afb641c49168e2fc45672b160519d8a9e9e3093e1fd02a1af8ca1936de7f29c316685ac25946636890c760e
diff --git a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
new file mode 100644
index 000000000000..83454bbf2de6
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=54.56.56
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		aac? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~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 doc gnutls +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 fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
+		libass truetype:libfreetype
+		# 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=(
+	aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
+	aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora
+	twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265
+	xvid:libxvid
+)
+
+IUSE="
+	alsa +encode examples jack libressl 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 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_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}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		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}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.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}] )
+	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? ( app-text/texi2html )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	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 )
+"
+
+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 )
+	zvbi? ( 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 ) aacplus? ( 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
+	epatch_user
+}
+
+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 aac || use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac ; 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 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
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index da2f3192068b..58e4f6697c16 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,5 @@
 DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
+DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d
 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
 DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
diff --git a/media-video/mpv/mpv-0.15.0.ebuild b/media-video/mpv/mpv-0.15.0.ebuild
new file mode 100644
index 000000000000..b6a029730825
--- /dev/null
+++ b/media-video/mpv/mpv-0.15.0.ebuild
@@ -0,0 +1,300 @@
+# 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='threads(+)'
+
+WAF_PV='1.8.12'
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md )
+
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
+IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
+	+iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
+	openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
+	test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
+	xv zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	egl? ( || ( gbm X wayland ) )
+	enca? ( iconv )
+	gbm? ( drm egl )
+	lcms? ( || ( opengl egl ) )
+	libguess? ( iconv )
+	luajit? ( lua )
+	opengl? ( X )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	zsh-completion? ( cli )
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+	sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0 )
+	cdda? ( dev-libs/libcdio-paranoia )
+	drm? ( x11-libs/libdrm )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		enca? ( app-i18n/enca )
+		libguess? ( >=app-i18n/libguess-1.0 )
+		uchardet? ( dev-libs/uchardet )
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.2.0
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		vdpau? ( >=x11-libs/libvdpau-0.2 )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.8
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	test? ( >=dev-util/cmocka-1.0.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
+		die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+	fi
+
+	if ! use libass; then
+		ewarn "You have disabled the libass support."
+		ewarn "OSD and subtitles won't be available."
+	fi
+
+	if use openal; then
+		ewarn "You have enabled the openal audio output. Be warned that"
+		ewarn "this output is considered experimental by upstream."
+	fi
+
+	if use sdl; then
+		ewarn "You have enabled the sdl video and audio outputs. Note that"
+		ewarn "upstream provides these outputs for compatibility reasons only."
+		ewarn "You probably don't need them under the normal circumstances."
+	fi
+
+	if use libav; then
+		elog "You have enabled media-video/libav instead of media-video/ffmpeg."
+		elog "Upstream recommends media-video/ffmpeg, as some functionality"
+		elog "is not provided by media-video/libav."
+	fi
+
+	einfo "mpv optionally supports many different audio and video formats."
+	einfo "You will need to enable support for the desired formats in your"
+	einfo "libavcodec/libavformat provider:"
+	einfo "    media-video/ffmpeg or media-video/libav"
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	epatch_user
+}
+
+src_configure() {
+	local mywafargs=(
+		--confdir="${EPREFIX}"/etc/${PN}
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		--disable-gpl3		# Unclear license info. See Gentoo bug 571728.
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		--disable-optimize		# Do not add '-O2' to CFLAGS
+		--disable-debug-build	# Do not add '-g' to CFLAGS
+
+		$(use_enable doc html-build)
+		$(use_enable doc pdf-build)
+		$(use_enable vf-dlopen vf-dlopen-filters)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable enca)
+		$(use_enable libguess)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavfilter
+		--enable-libavdevice
+
+		# Audio outputs
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		$(use_enable alsa)
+		--disable-coreaudio
+
+		# Video outputs
+		--disable-cocoa
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xscreensaver xss)
+		$(use_enable X xext)
+		$(use_enable xv)
+		$(use_enable xinerama)
+		$(use_enable X xrandr)
+		$(use_enable opengl gl-x11)
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(use_enable wayland gl-wayland)
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-x-egl
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+
+		# HWaccels
+		$(use_enable vaapi vaapi-hwaccel)
+		# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
+
+		# TV features
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+	)
+
+	if use vaapi && use X && use egl; then
+		mywafargs+=(--enable-vaapi-x-egl)
+	else
+		mywafargs+=(--disable-vaapi-x-egl)
+	fi
+
+	# Create reproducible non-live builds
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}usr/bin/${PN}"
+	fi
+}
+
+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
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 582b98fc55c1..b6a029730825 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -23,7 +23,7 @@ else
 	inherit git-r3
 fi
 SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md etc/example.conf etc/input.conf )
+DOCS+=( README.md )
 
 # See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
 LICENSE="GPL-2+ BSD ISC"
diff --git a/media-video/projectx/projectx-0.91.0.10.ebuild b/media-video/projectx/projectx-0.91.0.10.ebuild
index 098bddbc2b17..0afa5f46c0b5 100644
--- a/media-video/projectx/projectx-0.91.0.10.ebuild
+++ b/media-video/projectx/projectx-0.91.0.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$
 
@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
 
 COMMON_DEP="dev-java/commons-net
diff --git a/metadata/.gitignore b/metadata/.gitignore
index 99995869fe11..cdb54a14aeab 100644
--- a/metadata/.gitignore
+++ b/metadata/.gitignore
@@ -9,4 +9,4 @@
 /timestamp.chk
 /timestamp.x
 /pkg_desc_index
-projects.xml
+/projects.xml
diff --git a/metadata/layout.conf b/metadata/layout.conf
index fd10e5af6723..e8ab2ec64d99 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,6 +1,12 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For details on this file, see the layout.conf section of the
+# portage(5) man page.
+
 # This went live Wednesday, July 4, 2012 at 10:00 UTC
-# For more details, please see: http://archives.gentoo.org/gentoo-dev-announce/msg_00000.xml
-# and/or GLEP 59.
+# https://archives.gentoo.org/gentoo-dev-announce/message/a15cbea85dd089c99302f949b4072c20
+# https://wiki.gentoo.org/wiki/GLEP:59
 manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
 # 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670).
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
new file mode 100644
index 000000000000..650903f097c4
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-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
+inherit eutils fcaps flag-o-matic toolchain-funcs
+
+DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
+HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="mirror://github/rbu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+SLOT="0"
+IUSE="gtk mp3 suid"
+
+CDEPEND="
+	net-libs/libpcap
+	gtk? (
+		x11-libs/gtk+:2
+		virtual/jpeg:0
+		media-libs/giflib:=
+		media-libs/libpng:=
+	)
+"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	mp3? ( media-sound/mpg123 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.1.6-giflib-5.patch
+
+	sed -i \
+		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+		png.c || die
+
+	# With newer libpng, --cflags causes build failures.
+	sed -i \
+		-e 's:pkg-config --cflags libpng:$(PKG_CONFIG) --libs libpng:' \
+		-e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	if use gtk; then
+		emake
+		mv driftnet driftnet-gtk || die
+		emake clean
+	fi
+
+	# build a non-gtk version for all users
+	sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
+	append-flags -DNO_DISPLAY_WINDOW
+	emake
+}
+
+src_install() {
+	dosbin driftnet
+	doman driftnet.1
+
+	use gtk && dosbin driftnet-gtk
+
+	dodoc CHANGES CREDITS README TODO
+
+	if use suid ; then
+		elog "marking the no-display driftnet as setuid root."
+		fowners root:wheel "/usr/sbin/driftnet"
+		fperms 710 "/usr/sbin/driftnet"
+		fperms u+s "/usr/sbin/driftnet"
+	fi
+}
+
+pkg_postinst() {
+	fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/sbin/driftnet
+	use gtk && fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/sbin/driftnet-gtk
+}
diff --git a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch
new file mode 100644
index 000000000000..30ad62c38f47
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch
@@ -0,0 +1,50 @@
+--- a/gif.c
++++ b/gif.c
+@@ -20,7 +20,12 @@
+  */
+ int gif_load_hdr(img I) {
+     GifFileType *g;
++#if GIFLIB_MAJOR > 4
++	int *GifError = NULL;
++    g = I->us = DGifOpenFileHandle(fileno(I->fp), GifError);
++#else
+     g = I->us = DGifOpenFileHandle(fileno(I->fp));
++#endif /* GIFLIB_MAJOR */
+     if (!I->us) {
+         I->err = IE_HDRFORMAT;
+         return 0;
+@@ -36,7 +41,12 @@
+  * Abort loading a GIF file after the header is done.
+  */
+ int gif_abort_load(img I) {
++#if GIFLIB_MAJOR > 4
++	int *GifError = NULL;
++    DGifCloseFile((GifFileType*)I->us, GifError);
++#else
+     DGifCloseFile((GifFileType*)I->us);
++#endif /* GIFLIB_MAJOR */
+     return 1;
+ }
+ 
+@@ -44,6 +54,9 @@
+  * Load GIF image.
+  */
+ int gif_load_img(img I) {
++#if GIFLIB_MAJOR > 4
++	int *GifError = NULL;
++#endif /* GIFLIB_MAJOR */
+     GifFileType *g = I->us;
+     struct SavedImage *si;
+     int ret = 0;
+@@ -114,7 +127,11 @@
+     ret = 1;
+ fail:
+ 
++#if GIFLIB_MAJOR > 4
++    DGifCloseFile(g, GifError);
++#else
+     DGifCloseFile(g);
++#endif /* GIFLIB_MAJOR */
+     
+     return ret;
+ }
diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 575eba8af065..d08b4327083a 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
diff --git a/net-dialup/mingetty/metadata.xml b/net-dialup/mingetty/metadata.xml
index 2bf5f6e1fab2..7cd707c0759f 100644
--- a/net-dialup/mingetty/metadata.xml
+++ b/net-dialup/mingetty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<longdescription>The mingetty program is a lightweight, minimalist getty program for
 use only on virtual consoles.  Mingetty is not suitable for serial
 lines (you should use the mgetty program in that case).</longdescription>
diff --git a/net-dialup/mingetty/mingetty-1.08.ebuild b/net-dialup/mingetty/mingetty-1.08.ebuild
index 7e382a426aa4..b12c705b8437 100644
--- a/net-dialup/mingetty/mingetty-1.08.ebuild
+++ b/net-dialup/mingetty/mingetty-1.08.ebuild
@@ -1,7 +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=5
+
 inherit toolchain-funcs eutils
 
 DESCRIPTION="A compact getty program for virtual consoles only"
@@ -13,17 +15,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="unicode"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	use unicode && epatch "${FILESDIR}"/${P}-utf8.patch
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -Wall -W -pipe -D_GNU_SOURCE" CC="$(tc-getCC)" || die "compile failed"
+	emake CFLAGS="${CFLAGS} -Wall -W -pipe -D_GNU_SOURCE" CC="$(tc-getCC)"
 }
 
 src_install () {
 	dodir /sbin /usr/share/man/man8
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 }
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index a80d7e96c23f..a821a831b385 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
   <longdescription>ppp (Paul's PPP Package) is an open source package which
   implements the Point-to-Point Protocol</longdescription>
   <use>
diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml
index 1e11e7bbd01b..c9169515bdf5 100644
--- a/net-dialup/rp-pppoe/metadata.xml
+++ b/net-dialup/rp-pppoe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-dialup/xc/metadata.xml b/net-dialup/xc/metadata.xml
index 946425b89ea5..f745bd6e8cd5 100644
--- a/net-dialup/xc/metadata.xml
+++ b/net-dialup/xc/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
-
+	<maintainer>
+		<email>kumba@gentoo.org</email>
+		<name>Joshua Kinard</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-dns/bind-tools/bind-tools-9.10.3_p2.ebuild b/net-dns/bind-tools/bind-tools-9.10.3_p2.ebuild
index d5ab2d435a72..44b36de9f14d 100644
--- a/net-dns/bind-tools/bind-tools-9.10.3_p2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.3_p2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/bind-9.10.3_p2.ebuild b/net-dns/bind/bind-9.10.3_p2.ebuild
index 90a6f35047aa..5565ba5df42c 100644
--- a/net-dns/bind/bind-9.10.3_p2.ebuild
+++ b/net-dns/bind/bind-9.10.3_p2.ebuild
@@ -39,7 +39,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb +caps dlz doc fetchlimit filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl mysql nslint odbc postgres python rpz seccomp selinux sit ssl static-libs
 +threads urandom xml"
diff --git a/net-fs/ncpfs/metadata.xml b/net-fs/ncpfs/metadata.xml
index 55227da799da..7149c89bee9c 100644
--- a/net-fs/ncpfs/metadata.xml
+++ b/net-fs/ncpfs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
+	<maintainer>
+		<email>kumba@gentoo.org</email>
+		<name>Joshua Kinard</name>
+	</maintainer>
 	<longdescription>Provides Access to Netware services using the NCP protocol (Kernel support must be activated!)</longdescription>
 </pkgmetadata>
diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild b/net-fs/samba/samba-4.2.7-r1.ebuild
index e3684eb3a122..9aae0bb789dd 100644
--- a/net-fs/samba/samba-4.2.7-r1.ebuild
+++ b/net-fs/samba/samba-4.2.7-r1.ebuild
@@ -30,6 +30,7 @@ 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
 )
 
 # sys-apps/attr is an automagic dependency (see bug #489748)
diff --git a/net-fs/samba/samba-4.3.4.ebuild b/net-fs/samba/samba-4.3.4.ebuild
index e8edaf882944..9a62e8878345 100644
--- a/net-fs/samba/samba-4.3.4.ebuild
+++ b/net-fs/samba/samba-4.3.4.ebuild
@@ -30,6 +30,7 @@ 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
 )
 
 # sys-apps/attr is an automagic dependency (see bug #489748)
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 6ab2093ca514..969249534920 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -42,7 +42,6 @@ server.</longdescription>
 		<flag name="log_forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
 		<flag name="memcache">Enable support for the mod_memcache module, for using memcached servers</flag>
 		<flag name="msg">Enable support for the mod_msg module, allows system users to send messages to connected clients via the ftpdctl program.</flag>
-		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> support</flag>
 		<flag name="qos">Enable support for the mod_qos module</flag>
 		<flag name="ratio">Enable support for the mod_ratio module</flag>
 		<flag name="readme">Enable support for the mod_readme module</flag>
diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
deleted file mode 100644
index 313faba9c129..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.5a-r1.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=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.3"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	local mod_name=$1
-	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
-
-	mv "${mod_topdir}/${mod_name}.c" contrib || die
-	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
-	rm -r "${mod_topdir}" || die
-}
-
-src_prepare() {
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && m="${m}:mod_dynmasq"
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use log_forensic && m="${m}:mod_log_forensic"
-	use msg && m="${m}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	use snmp && m="${m}:mod_snmp"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use unique_id && m="${m}:mod_unique_id"
-	use vroot && m="${m}:mod_vroot"
-
-	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
-		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
-		m="${m}:${PROFTP_CUSTOM_MODULES}"
-	fi
-
-	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable ssl openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
-	rm -rf "${ED}"/var/run
-
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.5a.ebuild b/net-ftp/proftpd/proftpd-1.3.5a.ebuild
deleted file mode 100644
index 0585b9964bf6..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.5a.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.3"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses:0= )
-	openssl? ( dev-libs/openssl:0= )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	local mod_name=$1
-	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
-
-	mv "${mod_topdir}/${mod_name}.c" contrib || die
-	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
-	rm -r "${mod_topdir}" || die
-}
-
-src_prepare() {
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && m="${m}:mod_dynmasq"
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use log_forensic && m="${m}:mod_log_forensic"
-	use msg && m="${m}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	use snmp && m="${m}:mod_snmp"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use unique_id && m="${m}:mod_unique_id"
-	use vroot && m="${m}:mod_vroot"
-
-	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
-		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
-		m="${m}:${PROFTP_CUSTOM_MODULES}"
-	fi
-
-	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
-	rm -rf "${ED}"/var/run
-
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 452cb35ef074..de17c3e49ad7 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1 +1,2 @@
 DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae
+DIST bitlbee-3.4.1.tar.gz 688072 SHA256 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512 fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532 WHIRLPOOL 431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993
diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild
new file mode 100644
index 000000000000..4c281c914862
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild
@@ -0,0 +1,178 @@
+# 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 user python-single-r1 systemd
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
+SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
+	skype ssl test twitter +yahoo xinetd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16
+	purple? ( net-im/pidgin )
+	libevent? ( dev-libs/libevent )
+	otr? ( >=net-libs/libotr-4 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? ( ssl? ( dev-libs/openssl:0 ) )
+	)
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	selinux? ( sec-policy/selinux-bitlbee )
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	skype? (
+		dev-python/skype4py[${PYTHON_USEDEP}]
+		net-im/skype
+	)
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="|| ( purple xmpp msn oscar yahoo )
+	msn? ( || ( gnutls nss ssl ) )
+	xmpp? ( !nss )"
+
+pkg_setup() {
+	if use xmpp && ! use gnutls && ! use ssl ; then
+		einfo
+		elog "You have enabled support for Jabber but do not have SSL"
+		elog "support enabled.  This *will* prevent bitlbee from being"
+		elog "able to connect to SSL enabled Jabber servers.  If you need to"
+		elog "connect to Jabber over SSL, enable ONE of the following use"
+		elog "flags: gnutls or ssl"
+		einfo
+	fi
+
+	use skype && python-single-r1_pkg_setup
+
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+	sed -i \
+		-e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
+		-e "s/nobody/bitlbee/" \
+		-e "s/}/	disable         = yes\n}/" \
+		doc/bitlbee.xinetd || die "sed failed in xinetd"
+
+	sed -i \
+		-e "s@mozilla-nss@nss@g" \
+		configure || die "sed failed in configure"
+
+	use skype && python_fix_shebang protocols/skype/skyped.py
+
+	epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch
+}
+
+src_configure() {
+	# setup plugins, protocol, ipv6 and debug
+	use xmpp && myconf="${myconf} --jabber=1"
+	for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do
+		if use ${flag} ; then
+			myconf="${myconf} --${flag}=1"
+		else
+			myconf="${myconf} --${flag}=0"
+		fi
+	done
+
+	# set otr
+	if use otr && use plugins ; then
+		myconf="${myconf} --otr=plugin"
+	else
+		if use otr ; then
+			ewarn "OTR support has been disabled automatically because it"
+			ewarn "requires the plugins USE flag."
+		fi
+		myconf="${myconf} --otr=0"
+	fi
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf="${myconf} --ssl=gnutls"
+		einfo "Using gnutls for SSL support"
+	elif use ssl ; then
+		myconf="${myconf} --ssl=openssl"
+		einfo "Using openssl for SSL support"
+	elif use nss ; then
+		myconf="${myconf} --ssl=nss"
+		einfo "Using nss for SSL support"
+	else
+		myconf="${myconf} --ssl=bogus"
+		einfo "You will not have any encryption support enabled."
+	fi
+
+	# set event handler
+	if use libevent ; then
+		myconf="${myconf} --events=libevent"
+	else
+		myconf="${myconf} --events=glib"
+	fi
+
+	# NOTE: bitlbee's configure script is not an autotool creation,
+	# so that is why we don't use econf.
+	./configure \
+		--prefix=/usr --datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \
+		--systemdsystemunitdir=$(systemd_get_unitdir) \
+		--doc=1 --strip=0 ${myconf} || die "econf failed"
+
+	sed -i \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die "sed failed"
+}
+
+src_install() {
+	emake install install-etc install-doc install-dev install-systemd DESTDIR="${D}"
+
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+
+	if use skype ; then
+		newdoc protocols/skype/NEWS NEWS-skype
+		newdoc protocols/skype/README README-skype
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee
+	newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
+
+	exeinto /usr/share/bitlbee
+	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+	[[ -d "${ROOT}"/var/run/bitlbee ]] &&
+		chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+
+	einfo
+	elog "The bitlbee init script will now attempt to stop all processes owned by the"
+	elog "bitlbee user, including per-client forks."
+	elog
+	elog "Tell the init script not to touch anything besides the main bitlbee process"
+	elog "by changing the BITLBEE_STOP_ALL variable in"
+	elog "	/etc/conf.d/bitlbee"
+	einfo
+}
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
new file mode 100644
index 000000000000..fb77fd840e35
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -0,0 +1,176 @@
+# 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 user python-single-r1 systemd
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
+	inherit git-r3
+else
+	SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
+	skype ssl test twitter +yahoo xinetd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16
+	purple? ( net-im/pidgin )
+	libevent? ( dev-libs/libevent )
+	otr? ( >=net-libs/libotr-4 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? ( ssl? ( dev-libs/openssl:0 ) )
+	)
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	selinux? ( sec-policy/selinux-bitlbee )
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	skype? (
+		dev-python/skype4py[${PYTHON_USEDEP}]
+		net-im/skype
+	)
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="|| ( purple xmpp msn oscar yahoo )
+	msn? ( || ( gnutls nss ssl ) )
+	xmpp? ( !nss )"
+
+pkg_setup() {
+	if use xmpp && ! use gnutls && ! use ssl ; then
+		einfo
+		elog "You have enabled support for Jabber but do not have SSL"
+		elog "support enabled.  This *will* prevent bitlbee from being"
+		elog "able to connect to SSL enabled Jabber servers.  If you need to"
+		elog "connect to Jabber over SSL, enable ONE of the following use"
+		elog "flags: gnutls or ssl"
+		einfo
+	fi
+
+	use skype && python-single-r1_pkg_setup
+
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+	sed -i \
+		-e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
+		-e "s/nobody/bitlbee/" \
+		-e "s/}/	disable         = yes\n}/" \
+		doc/bitlbee.xinetd || die "sed failed in xinetd"
+
+	sed -i \
+		-e "s@mozilla-nss@nss@g" \
+		configure || die "sed failed in configure"
+
+	use skype && python_fix_shebang protocols/skype/skyped.py
+
+	[[ ${PV} != "9999" ]] && epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch
+	epatch_user
+}
+
+src_configure() {
+	# setup plugins, protocol, ipv6 and debug
+	use xmpp && myconf="${myconf} --jabber=1"
+	for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do
+		if use ${flag} ; then
+			myconf="${myconf} --${flag}=1"
+		else
+			myconf="${myconf} --${flag}=0"
+		fi
+	done
+
+	# set otr
+	if use otr && use plugins ; then
+		myconf="${myconf} --otr=plugin"
+	else
+		if use otr ; then
+			ewarn "OTR support has been disabled automatically because it"
+			ewarn "requires the plugins USE flag."
+		fi
+		myconf="${myconf} --otr=0"
+	fi
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf="${myconf} --ssl=gnutls"
+		einfo "Using gnutls for SSL support"
+	elif use ssl ; then
+		myconf="${myconf} --ssl=openssl"
+		einfo "Using openssl for SSL support"
+	elif use nss ; then
+		myconf="${myconf} --ssl=nss"
+		einfo "Using nss for SSL support"
+	else
+		myconf="${myconf} --ssl=bogus"
+		einfo "You will not have any encryption support enabled."
+	fi
+
+	# set event handler
+	if use libevent ; then
+		myconf="${myconf} --events=libevent"
+	else
+		myconf="${myconf} --events=glib"
+	fi
+
+	# NOTE: bitlbee's configure script is not an autotool creation,
+	# so that is why we don't use econf.
+	./configure \
+		--prefix=/usr --datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \
+		--systemdsystemunitdir=$(systemd_get_unitdir) \
+		--doc=1 --strip=0 ${myconf} || die "econf failed"
+
+	sed -i \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die "sed failed"
+}
+
+src_install() {
+	emake install install-etc install-doc install-dev install-systemd DESTDIR="${D}"
+
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+
+	if use skype ; then
+		newdoc protocols/skype/NEWS NEWS-skype
+		newdoc protocols/skype/README README-skype
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee
+	newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
+
+	exeinto /usr/share/bitlbee
+	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+	[[ -d "${ROOT}"/var/run/bitlbee ]] &&
+		chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+}
diff --git a/net-im/gajim/gajim-0.16.5.ebuild b/net-im/gajim/gajim-0.16.5.ebuild
index 20bb10c46815..151c3954619f 100644
--- a/net-im/gajim/gajim-0.16.5.ebuild
+++ b/net-im/gajim/gajim-0.16.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 ~x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch b/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..cb63980ee70e
--- /dev/null
+++ b/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch
@@ -0,0 +1,101 @@
+Fix buildsystem to explicitly compile with -std=gnu89 to avoid
+differencs in inline semantics introduced in GCC5.
+https://bugs.gentoo.org/show_bug.cgi?id=570598
+
+Additionally, fix QA issues caused by implicit declarations, such as:
+* QA Notice: Package triggers severe warnings which indicate that it
+*            may exhibit random runtime failures.
+* pork_inet.c:69:8: warning: implicit declaration of function ‘vasprintf’ [-Wimplicit-function-declaration]
+
+--- pork-0.99.8.1/configure.ac
++++ pork-0.99.8.1/configure.ac
+@@ -114,6 +114,8 @@
+ 
+ AC_CHECK_LIB(ncurses, resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define to 1 if you have the 'resizeterm' function in -lncurses.]))
+ 
++AC_SEARCH_LIBS(stdscr, tinfo)
++
+ AC_CHECK_TYPE(u_int32_t, uint32_t)
+ if test "$ac_cv_type_u_int32_t" = "no"; then
+ 	AC_CHECK_TYPE(uint32_t, unsigned int)
+--- pork-0.99.8.1/Makefile.am
++++ pork-0.99.8.1/Makefile.am
+@@ -1,3 +1,5 @@
++AM_CFLAGS = -std=gnu89
++
+ SUBDIRS = \
+ 	src			\
+ 	doc			\
+--- pork-0.99.8.1/src/Makefile.am
++++ pork-0.99.8.1/src/Makefile.am
+@@ -6,7 +6,7 @@
+ endif
+ 
+ 
+-AM_CFLAGS = -funsigned-char -Imissing -Wall -Iprotocols -fPIC
++AM_CFLAGS = -funsigned-char -Imissing -Wall -Iprotocols -fPIC -std=gnu89
+ AM_CFLAGS += -DHELP_PATH=\"$(pkgdatadir)/help\" -DSYSTEM_PORKRC=\"$(pkgdatadir)/porkrc\"
+ AM_CFLAGS += $(PERL_CFLAGS) $(DEBUG_CFLAGS)
+ 
+--- pork-0.99.8.1/src/missing/Makefile.am
++++ pork-0.99.8.1/src/missing/Makefile.am
+@@ -1,5 +1,5 @@
+ INCLUDES = -I../../src
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ noinst_LIBRARIES = libmissing.a
+ 
+--- pork-0.99.8.1/src/pork_inet.c
++++ pork-0.99.8.1/src/pork_inet.c
+@@ -9,8 +9,9 @@
+ 
+ #include <config.h>
+ 
+-#include <unistd.h>
++#define _GNU_SOURCE 1
+ #include <stdio.h>
++#include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+--- pork-0.99.8.1/src/pork_screen_io.c
++++ pork-0.99.8.1/src/pork_screen_io.c
+@@ -14,6 +14,8 @@
+ 
+ #include <config.h>
+ 
++#define _GNU_SOURCE 1
++#include <stdio.h>
+ #include <unistd.h>
+ #include <ncurses.h>
+ #include <stdlib.h>
+--- pork-0.99.8.1/src/protocols/aim/Makefile.am
++++ pork-0.99.8.1/src/protocols/aim/Makefile.am
+@@ -1,5 +1,5 @@
+ INCLUDES = -I. -I.. -I../.. -I../../.. -I../../missing -Ilibfaim
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ noinst_LIBRARIES = libaim.a
+ 
+--- pork-0.99.8.1/src/protocols/irc/Makefile.am
++++ pork-0.99.8.1/src/protocols/irc/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I. -I.. -I../.. -I../../.. -I../../missing
+ 
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ noinst_LIBRARIES = libirc.a
+ 
+--- pork-0.99.8.1/src/protocols/Makefile.am
++++ pork-0.99.8.1/src/protocols/Makefile.am
+@@ -3,6 +3,6 @@
+ endif
+ 
+ INCLUDES = -I. -I.. -I../.. -I../missing
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ SUBDIRS = $(irc_dir) aim
diff --git a/net-im/pork/pork-0.99.8.1-r1.ebuild b/net-im/pork/pork-0.99.8.1-r1.ebuild
new file mode 100644
index 000000000000..0a2e6809a59c
--- /dev/null
+++ b/net-im/pork/pork-0.99.8.1-r1.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 autotools
+
+DESCRIPTION="Console based AIM client that looks like ircII"
+HOMEPAGE="http://dev.ojnk.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="perl"
+
+RDEPEND="
+	perl? ( dev-lang/perl )
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable perl)
+}
+
+src_install() {
+	default
+
+	doman doc/pork.1
+	insinto /usr/share/pork/examples
+	doins examples/blist.txt
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README STYLE TODO QUICK_START
+}
diff --git a/net-im/prosody/prosody-0.9.9.ebuild b/net-im/prosody/prosody-0.9.9.ebuild
index 879f797f86b9..5b7fa48b9c7a 100644
--- a/net-im/prosody/prosody-0.9.9.ebuild
+++ b/net-im/prosody/prosody-0.9.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
 
 DEPEND="net-im/jabber-base
diff --git a/net-irc/irssi-otr/metadata.xml b/net-irc/irssi-otr/metadata.xml
index ff60bc4b5e36..52dfe678b740 100644
--- a/net-irc/irssi-otr/metadata.xml
+++ b/net-irc/irssi-otr/metadata.xml
@@ -5,4 +5,8 @@
 	<upstream>
 		<remote-id type="github">cryptodotis/irssi-otr</remote-id>
 	</upstream>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index bfdfc1e22284..e014acd79a6b 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>net-irc</herd>
 <maintainer>
+	<email>monsieurp@gentoo.org</email>
+	<name>Patrice Clement</name>
+</maintainer>
+<maintainer>
 	<email>swegener@gentoo.org</email>
 	<description>Primary Maintainer</description>
 </maintainer>
diff --git a/net-irc/irssistats/metadata.xml b/net-irc/irssistats/metadata.xml
index 6ef15e900f17..2993f5a3bd78 100644
--- a/net-irc/irssistats/metadata.xml
+++ b/net-irc/irssistats/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
+<maintainer>
+	<email>monsieurp@gentoo.org</email>
+	<name>Patrice Clement</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-irc/jircii/jircii-41.ebuild b/net-irc/jircii/jircii-41.ebuild
index 993a225e260b..783e0bccfe96 100644
--- a/net-irc/jircii/jircii-41.ebuild
+++ b/net-irc/jircii/jircii-41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jirc.hick.org/"
 SRC_URI="http://jirc.hick.org/download/jerkb${PV}.tgz"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/net-libs/libotr/metadata.xml b/net-libs/libotr/metadata.xml
index 3e2b4181f5be..c9169515bdf5 100644
--- a/net-libs/libotr/metadata.xml
+++ b/net-libs/libotr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild
index 2258dbb732bf..d65747c8bf84 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/libtorrent/libtorrent-0.13.6.ebuild b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
index bd8c6e820358..9614040a2b66 100644
--- a/net-libs/libtorrent/libtorrent-0.13.6.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug ipv6 libressl ssl test"
 
 RDEPEND="
diff --git a/net-libs/net6/net6-1.3.14-r1.ebuild b/net-libs/net6/net6-1.3.14-r1.ebuild
index 2225e4c77725..5043967e0bea 100644
--- a/net-libs/net6/net6-1.3.14-r1.ebuild
+++ b/net-libs/net6/net6-1.3.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~x86"
 IUSE="nls static-libs"
 
 RDEPEND="dev-libs/libsigc++:2
diff --git a/net-libs/txtorcon/metadata.xml b/net-libs/txtorcon/metadata.xml
index 9ce1c0433878..a79a9c4ca746 100644
--- a/net-libs/txtorcon/metadata.xml
+++ b/net-libs/txtorcon/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>mrueg@gentoo.org</email>
-    <name>Manuel Rüger</name>
+    <email>maintainer-needed@gentoo.org</email>
   </maintainer>
   <upstream>
     <remote-id type="pypi">txtorcon</remote-id>
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 20be1672603b..34c9b743182a 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcpcd/dhcpcd-6.10.0.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.0.ebuild
index 99fa5e4af08f..15ac2a5957b9 100644
--- a/net-misc/dhcpcd/dhcpcd-6.10.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.10.0.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/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild b/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild
index 9174dfa142b5..2752f67c082e 100644
--- a/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild
+++ b/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.moldaner.de/wakeonlan/download/wakeonlan-${PV}.zip"
 HOMEPAGE="http://www.moldaner.de/wakeonlan/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="dev-java/jsap:0
diff --git a/net-misc/mindterm/mindterm-3.4.ebuild b/net-misc/mindterm/mindterm-3.4.ebuild
index f6526a6f376e..ce3ebe620b7d 100644
--- a/net-misc/mindterm/mindterm-3.4.ebuild
+++ b/net-misc/mindterm/mindterm-3.4.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$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.appgate.com/downloads/MindTerm-${PV}/${MY_P}-src.zip"
 
 LICENSE="mindterm"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 COMMON_DEP="dev-java/jzlib:0"
 RDEPEND=">=virtual/jre-1.4
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 9e862a15f4c2..4a00c5c0194c 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,3 +1,2 @@
 DIST NetworkManager-1.0.10.tar.xz 3488600 SHA256 1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc SHA512 0c5df37565c1ec6fafe60fad0ede34d28e7d87200e338489f35eec18c3e88920f47d58eae5a8aba5caeddb26a6f7074e79e8f6a7d4f7584ce3cc9be0df99f1ef WHIRLPOOL e1a0158d69e444224c25a6287bbe4f3b89d623c85f39a59eb2aeffca83b38cd85ccf067af14e5ff79b23b4346f606e15e3d33b9d097c7ef8d50054fdc5056379
 DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97
-DIST NetworkManager-1.0.8.tar.xz 3409672 SHA256 8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f SHA512 f27d22aed52fccd037c67983f845a94152263bfbc3a8d8d5693cd8e115dbd0cdfd28e4bed291fce61840ffa05426d48b3e0a18b9596202a7f5048090caa5d87c WHIRLPOOL ab550b88a2f68d74f2064ef2a0ae7473f739cd2640b6c365d1ff9f04d8dec51208f96cd46e36fbdb1dd999b109498d8f76cf683fc121168571b5565a8371cde0
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch b/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch
new file mode 100644
index 000000000000..b7c2be695a0f
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch
@@ -0,0 +1,51 @@
+From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Mon, 4 Jan 2016 18:54:26 +0100
+Subject: core: fix failure to configure routes due to wrong device-route for
+ IPv4 peer-addresses
+
+As in the case of a OpenVPN connection, we might add an address like:
+  10.8.0.58/32 ptp 10.8.0.57
+
+In this case, kernel would automatically add a device-route like:
+  10.8.0.57/32 via 0.0.0.0 dev 32 metric 0 mss 0 src rtprot-kernel scope link pref-src 10.8.0.58
+
+nm_ip4_config_commit() checks all IP addresses to figure out
+the present device-routes. Then the routes are synced by NMRouteManager.
+Due to a bug, we would not consider the peer-address, but the local-address
+and configure a route 10.8.0.58/32, instead of 10.8.0.57/32.
+
+That stays mostly unnoticed, because usually the peer and the local-address are
+in the same subnet, so that there is no difference (/32 is an example of the
+peer-address being in a different subnet).
+
+It also seems that due to a bug fixed by df4e5357521 this issue didn't surface.
+Probably because we would not notice the 10.8.0.57/32 right away and thus
+nm_route_manager_ip4_route_sync() would not wrongly delete it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759892
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526
+https://bugs.archlinux.org/task/47535
+https://bugzilla.redhat.com/show_bug.cgi?id=1294309
+https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html
+
+diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
+index f625d35..61e29af 100644
+--- a/src/nm-ip4-config.c
++++ b/src/nm-ip4-config.c
+@@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex, gboolean routes_fu
+ 
+ 				route.ifindex = ifindex;
+ 				route.source = NM_IP_CONFIG_SOURCE_KERNEL;
+-				route.network = nm_utils_ip4_address_clear_host_address (addr->address, addr->plen);
++				route.network = nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address,
++				                                                         addr->plen);
+ 				route.plen = addr->plen;
+ 				route.pref_src = addr->address;
+ 				route.metric = default_route_metric;
+-- 
+cgit v0.10.2
+
diff --git a/net-misc/networkmanager/networkmanager-1.0.8.ebuild b/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
index b3970b84d1d7..e8d71e396efc 100644
--- a/net-misc/networkmanager/networkmanager-1.0.8.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	>=dev-libs/libnl-3.2.8:3=
 	>=sys-auth/polkit-0.106
 	net-libs/libndp
-	>=net-libs/libsoup-2.26:2.4=
+	>=net-libs/libsoup-2.40:2.4=
 	net-misc/iputils
 	sys-libs/readline:0
 	>=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
@@ -124,12 +124,13 @@ src_prepare() {
 	# Don't build examples, they are not needed and can cause build failure
 	sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die
 
-	use vala && vala_src_prepare
+	# core: fix failure to configure routes due to wrong device-route for IPv4 peer-addresses
+	# (from 1.0 branch)
+	epatch "${FILESDIR}"/${P}-vpn-routes.patch
 
+	use vala && vala_src_prepare
 	epatch_user # don't remove, users often want custom patches for NM
-
 	eautoreconf
-
 	gnome2_src_prepare
 }
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 775ee66ef488..61ef95566174 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -3,6 +3,7 @@ DIST openssh-7.1p1+x509-8.6.diff.gz 413931 SHA256 cbf661a1fec080dc9ed335a2904141
 DIST openssh-7.1p1-hpnssh14v9.tar.xz 21580 SHA256 a795c2f2621f537b3fd98172cbd1f7c71869e4da78cd280d123fa19ae4262b97 SHA512 6ce151949bf81b5518b95092a2f18d2f24581954e2c629deaf3c1d10136f32f830567aafb9b4045547e95e3ab63cf750e240eac40e2b9caa6d71cb2b132821ec WHIRLPOOL 8e3c9a1d79112092a6cb42c6766ccdf61e5d8fcd366ea5c7d3bab94cf309bcc12f3761476a288158638a340023aa24519d888caac19fb0ef25fa56bdab06412c
 DIST openssh-7.1p1.tar.gz 1493170 SHA256 fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 SHA512 f1491ca5a0a733eb27ede966590642a412cb7be7178dcb7b9e5844bbdc8383032f4b00435192b95fc0365b6fe74d6c5ac8d6facbe9d51e1532d049e2f784e8f7 WHIRLPOOL a650a93657f930d20dc3fa24ab720857f63f7cd0a82d1906cf1e58145e866129207851d5e587d678655e5731fa73221ab9b6ea0754533100c25fe2acaa442e05
 DIST openssh-7.1p2+x509-8.6.diff.xz 283964 SHA256 0848ceb42fa15f6197d5d81f9da6dea9cc3a7fda2fdb424447fa0f995a5197d1 SHA512 276f5738498ce9a559a5066cfeb670c48f275c2cbf7b007f213405b71349f1f77cc2c7bee6af5ee548b9443f0e44ede0e3d232a31b52ac834cf81cac855bfa87 WHIRLPOOL 024b9f0d9dda3ec2ae7da156f801c3735e5ff7198010fbc021ccde8adada28e45f076264c9f09fc34586adc52d8ad93689b4bdbecaaad7761bb9e26a8c4af231
+DIST openssh-7.1p2+x509-8.7.diff.gz 438584 SHA256 23030dff924a78718686fad6442b1083293b0c2a057714291bd0af9ed8ef5868 SHA512 d9aa43f5fc06b88b442285a9f9a15d01b52796c36f0cb228c756edca473a89eadb296c45503a14514fdb156d3bc9d90ff33271ccfa9461a9bb2b798a581cc007 WHIRLPOOL ef3f4486fff0addad1a6bdcde3ba606d55d6e3ea5d2cd6e79bfe2494d660c38f0e9f1c157af72c3b6ad5e6eb3731168f975b26c94f8357154e54c08e5d876652
 DIST openssh-7.1p2-hpnssh14v10.tar.xz 22388 SHA256 729e20a2627ca403da6cfff8ef251c03421022123a21c68003181b4e5409bcc5 SHA512 b8e88ac5891ed632416db8da6377512614f19f5f7a7c093b55ecfe3e3f50979c61c0674e9381c316632d8daed90f8cce958c9b77bd00084a4ee1b0297cf321ba WHIRLPOOL c466cc33dc4a40e9466148beb154c539e095ac1b9cdcc5b3d235cbcf12ca10255d63da2f0e1da10d1afa1a0d2ebd436ca0d9e542c732df6ef67fb8f4d2d0192c
 DIST openssh-7.1p2.tar.gz 1475829 SHA256 dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd SHA512 d5be60f3645ec238b21e1f2dfd801b2136146674bbc086ebdb14be516c613819bc87c84b5089f3a45fe6e137a7458404f79f42572c69d91571e45ebed9d5e3af WHIRLPOOL 9f48952b82db3983c20e84bcff5b6761f5b284174072c828698dced3a53ca8bbc2e1f89d2e82b62a68f4606b52c980fcf097250f86c1a67ad343d20e3ec9d1f4
 DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081 WHIRLPOOL b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b
diff --git a/net-misc/openssh/openssh-7.1_p2-r1.ebuild b/net-misc/openssh/openssh-7.1_p2-r1.ebuild
new file mode 100644
index 000000000000..5c418d414b8d
--- /dev/null
+++ b/net-misc/openssh/openssh-7.1_p2-r1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v10.tar.xz"
+LDAP_PATCH="${PN}-lpk-7.1p2-0.3.14.patch.xz"
+X509_VER="8.7" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	mirror://gentoo/${PN}-6.8_p1-sctp.patch.xz
+	${HPN_PATCH:+hpn? (
+		mirror://gentoo/${HPN_PATCH}
+		mirror://sourceforge/hpnssh/${HPN_PATCH}
+	)}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD 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 ~arm-linux ~x86-linux"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl pam +pie sctp selinux skey ssh1 +ssl static X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap ssl )"
+
+LIB_DEPEND="
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-0.9.8f:0[bindist=]
+			dev-libs/openssl:0[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_setup() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		pushd .. >/dev/null
+		if use hpn ; then
+			pushd ${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+			popd >/dev/null
+		fi
+		epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
+		popd >/dev/null
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		epatch "${FILESDIR}"/${PN}-7.1_p2-x509-hpn14v10-glue.patch
+		save_version X509
+	fi
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+	epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	# The X509 patchset fixes this independently.
+	use X509 || epatch "${FILESDIR}"/${PN}-6.8_p1-ssl-engine-configure.patch
+	epatch "${WORKDIR}"/${PN}-6.8_p1-sctp.patch
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t tests skipped failed passed shell
+	tests="interop-tests compat-tests"
+	skipped=""
+	shell=$(egetshell ${UID})
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite"
+		elog "requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped="${skipped} tests"
+	else
+		tests="${tests} tests"
+	fi
+	# It will also attempt to write to the homedir .ssh
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in ${tests} ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed="${passed}${t} " \
+			|| failed="${failed}${t} "
+	done
+	einfo "Passed tests: ${passed}"
+	ewarn "Skipped tests: ${skipped}"
+	if [[ -n ${failed} ]] ; then
+		ewarn "Failed tests: ${failed}"
+		die "Some tests failed: ${failed}"
+	else
+		einfo "Failed tests: ${failed}"
+		return 0
+	fi
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/tor/tor-0.2.7.6.ebuild b/net-misc/tor/tor-0.2.7.6.ebuild
index f23d270c0111..cdd4563dfda8 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/vde/vde-2.3.2-r2.ebuild b/net-misc/vde/vde-2.3.2-r2.ebuild
index f796dcab5382..bb97357a7fc8 100644
--- a/net-misc/vde/vde-2.3.2-r2.ebuild
+++ b/net-misc/vde/vde-2.3.2-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://vde.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 IUSE="pcap python selinux ssl static-libs"
 
diff --git a/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild b/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild
index b5b6d6af3f50..0c8b584370d0 100644
--- a/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="offensive test"
 
 DEPEND="
diff --git a/net-nds/jxplorer/jxplorer-3.2-r2.ebuild b/net-nds/jxplorer/jxplorer-3.2-r2.ebuild
index 44aa99c9c0b1..a625c03739d0 100644
--- a/net-nds/jxplorer/jxplorer-3.2-r2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.2-r2.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,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/JXv${PV}src.tar.bz2
 LICENSE="CAOSL"
 IUSE=""
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/javahelp-2.0.02_p46
 	>=dev-java/log4j-1.2.8
diff --git a/net-nds/jxplorer/jxplorer-3.2.ebuild b/net-nds/jxplorer/jxplorer-3.2.ebuild
index 40d7fc8a5c3a..58425892d9ad 100644
--- a/net-nds/jxplorer/jxplorer-3.2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/JXv${PV}src.tar.bz2
 	mirror://sourceforge/${PN}/JXv${PV}deploy.tar.bz2"
 LICENSE="CAOSL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/javahelp-2.0.02_p46
 	>=dev-java/log4j-1.2.8
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
index dd1099e71f09..caba27537d4e 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.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$
 
@@ -15,7 +15,7 @@ LICENSE="CAOSL"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=virtual/jre-1.5
 	>=dev-java/javahelp-2.0.02_p46:0"
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
index 7948b7b5d7cb..70b8845852ab 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.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$
 
@@ -15,7 +15,7 @@ LICENSE="CAOSL"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=virtual/jre-1.5
 	>=dev-java/javahelp-2.0.02_p46:0"
diff --git a/net-p2p/myster/myster-8.0-r1.ebuild b/net-p2p/myster/myster-8.0-r1.ebuild
index 559b4550b714..f785cc47846a 100644
--- a/net-p2p/myster/myster-8.0-r1.ebuild
+++ b/net-p2p/myster/myster-8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/myster/Myster_PR${MY_PV}_Generic.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
index 30c142e200c1..2cd320ddc285 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug ipv6 selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
index c43fbf97709a..92b96bccd948 100644
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
+++ b/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.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$
 
@@ -29,7 +29,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND="~net-p2p/vuze-${PV}"
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.3.0.0.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.3.0.0.ebuild
index ab73c7a2f268..a188fadfc18d 100644
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.3.0.0.ebuild
+++ b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.3.0.0.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$
 
@@ -27,7 +27,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="~net-p2p/vuze-${PV}"
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.6.0.0.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.6.0.0.ebuild
index c17a7de35508..fe0d42660a92 100644
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.6.0.0.ebuild
+++ b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.6.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$
 
@@ -27,7 +27,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="~net-p2p/vuze-${PV}"
diff --git a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
index f146132b2044..740ee3e3f60d 100644
--- a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
+++ b/net-p2p/vuze/vuze-4.8.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$
 
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/Vuze_${MY_PV}/${SRC_TARBALL}
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 # bundles parts of commons-lang, but modified
diff --git a/net-p2p/vuze/vuze-5.3.0.0.ebuild b/net-p2p/vuze/vuze-5.3.0.0.ebuild
index 041e5e9a1574..b7742d12c2dd 100644
--- a/net-p2p/vuze/vuze-5.3.0.0.ebuild
+++ b/net-p2p/vuze/vuze-5.3.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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 # bundles parts of http://www.programmers-friend.org/
diff --git a/net-p2p/vuze/vuze-5.6.0.0.ebuild b/net-p2p/vuze/vuze-5.6.0.0.ebuild
index 9ebddd2dc54d..1f66b0f160df 100644
--- a/net-p2p/vuze/vuze-5.6.0.0.ebuild
+++ b/net-p2p/vuze/vuze-5.6.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$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 # bundles parts of http://www.programmers-friend.org/
diff --git a/net-p2p/xnap/xnap-2.5-r3.ebuild b/net-p2p/xnap/xnap-2.5-r3.ebuild
index 3f1dde6a8163..817febce4a13 100644
--- a/net-p2p/xnap/xnap-2.5-r3.ebuild
+++ b/net-p2p/xnap/xnap-2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ HOMEPAGE="http://xnap.sf.net"
 SRC_URI="mirror://sourceforge/xnap/${P}r3.jar"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="x86"
 IUSE=""
 RDEPEND=">=virtual/jre-1.3"
 
diff --git a/net-p2p/yaggui/yaggui-0.9.2.ebuild b/net-p2p/yaggui/yaggui-0.9.2.ebuild
index 8cc085e1b331..a628d5b858a7 100644
--- a/net-p2p/yaggui/yaggui-0.9.2.ebuild
+++ b/net-p2p/yaggui/yaggui-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://yaggui.sourceforge.net/"
 SRC_URI="mirror://sourceforge/yaggui/${MY_P/y/Y}.zip"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 COMMON_DEP="=dev-java/jgoodies-looks-1.2*"
diff --git a/net-print/cups-filters/cups-filters-1.5.0.ebuild b/net-print/cups-filters/cups-filters-1.5.0.ebuild
index 4c78eb20d9c1..155d0f2f84d3 100644
--- a/net-print/cups-filters/cups-filters-1.5.0.ebuild
+++ b/net-print/cups-filters/cups-filters-1.5.0.ebuild
@@ -11,10 +11,10 @@ inherit base eutils perl-module autotools systemd
 if [[ "${PV}" == "9999" ]] ; then
 	inherit bzr
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
+	KEYWORDS="alpha arm hppa ppc ppc64"
 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"
+	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"
diff --git a/net-wireless/mfoc/metadata.xml b/net-wireless/mfoc/metadata.xml
index 1fb5c16ace5d..73575a37e50a 100644
--- a/net-wireless/mfoc/metadata.xml
+++ b/net-wireless/mfoc/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nfc-tools/mfoc</remote-id>
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 4ddf0980d0a9..705dbb67b71c 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -16,3 +16,7 @@ media-libs/opencv ipp
 # Tomas Chvatal <scarabeus@gentoo.org> (13 Nov 2014)
 # The apulse is 32b used there only
 net-im/skype apulse
+
+# Tim Harder <radhermit@gentoo.org> (17 Jan 2016)
+# Skype requires multilib support
+net-im/bitlbee skype
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 13119563dd0b..9309614205cf 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -298,8 +298,6 @@ media-libs/allegro mmx sse
 media-libs/libfame mmx
 media-libs/sdl-gfx mmx
 media-libs/smpeg mmx
-net-irc/xchat mmx
-net-irc/xchat-gnome mmx
 net-misc/asterisk mmx
 x11-terms/eterm mmx
 media-tv/xawtv mmx
@@ -309,8 +307,6 @@ media-libs/allegro cpu_flags_x86_mmx cpu_flags_x86_sse
 media-libs/libfame cpu_flags_x86_mmx
 media-libs/sdl-gfx cpu_flags_x86_mmx
 media-libs/smpeg cpu_flags_x86_mmx
-net-irc/xchat cpu_flags_x86_mmx
-net-irc/xchat-gnome cpu_flags_x86_mmx
 net-misc/asterisk cpu_flags_x86_mmx
 x11-terms/eterm cpu_flags_x86_mmx
 media-tv/xawtv cpu_flags_x86_mmx
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index aad775c96c3b..1d7895418c4a 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,9 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # This file requires >=portage-2.1.1
 
+# James Le Cuirot <chewi@gentoo.org> (12 Jan 2015)
+# Java is no longer supported on ppc.
+app-text/texlive pdfannotextractor
+dev-lang/logtalk fop
+gnome-extra/libgda reports
+net-analyzer/wireshark doc-pdf
+sci-misc/nco ncap2
+
 # Michael Weber <xmw@gentoo.org> (09 Jan 2016)
 # no ppc support in media-libs/glfw
 app-text/mupdf opengl
diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 6394c21ce859..a9e3bc3eed14 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -1,6 +1,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ppc
 
+# James Le Cuirot <chewi@gentoo.org> (12 Jan 2015)
+# Java is no longer supported on ppc.
+java
+
 # Ben de Groot <yngwin@gentoo.org> (01 Feb 2015)
 # please remove when keyworded
 qt5
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 2c3e4294af1c..21ae755f84e9 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -32,9 +32,6 @@ app-text/asciidoc test highlight
 
 app-misc/mc pam
 
-# See https://bugzilla.gnome.org/show_bug.cgi?id=370847 for why we disable pam
-gnome-extra/gnome-screensaver pam
-
 # Requires Linux-only packages
 app-accessibility/gok usb
 
diff --git a/profiles/default/linux/uclibc/package.use.mask b/profiles/default/linux/uclibc/package.use.mask
new file mode 100644
index 000000000000..54a8bdd36d0a
--- /dev/null
+++ b/profiles/default/linux/uclibc/package.use.mask
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Joshua Kinard <kumba@gentoo.org> (18 Jan 2016)
+# Fails linking to gettext/libintl for symbol 'libintl_gettext'.
+# Is fixable by using 'append-ldflags' from flag-o-matic to force
+# -lintl, but that's a QA violation.  Real solution is to use
+# 'append-libs', but xfsdump's build system doesn't honor $LIBS.
+# So this is the best way for now.  See 570548.
+sys-fs/xfsdump nls
diff --git a/profiles/hardened/linux/amd64/x32/parent b/profiles/hardened/linux/amd64/x32/parent
index f49ba262d9e9..6793db467fe7 100644
--- a/profiles/hardened/linux/amd64/x32/parent
+++ b/profiles/hardened/linux/amd64/x32/parent
@@ -1,3 +1,3 @@
-..
 ../../../../features/multilib
 ../../../../arch/amd64/x32
+..
diff --git a/profiles/package.mask b/profiles/package.mask
index 483c667383e4..837847b69115 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,14 +30,41 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Frysinger <vapier@gentoo.org> (18 Jan 2016)
+# Force people to migrate to the new combined libraries:
+# media-libs/elementary & dev-libs/efl. #571796
+app-benchmarks/expedite
+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
+
+# Sergei Trofimovich <slyfox@gentoo.org> (19 Jan 2016)
+# Mask broken package. Exposes badly designed API
+# that can't be transparently used in ghc-7.8 and
+# ghc-7.10, bug #561122
+dev-haskell/extra:0
+
+# Pacho Ramos <pacho@gentoo.org> (16 Jan 2016)
+# Dead for years, not compatible with latest libsigc++ (#569514), it
+# requires either a lot of patching or move to a forked project that tries
+# to continue it. Removal in a month.
+media-sound/seq24
+
 # James Le Cuirot <chewi@gentoo.org> (14 Jan 2016)
 # Superseded by gnu-classpath. Removal in 30 days.
 dev-java/gjdoc
 
-# Sergei Trofimovich <slyfox@gentoo.org> (14 Jan 2016)
-# Masked for testing.
->=net-im/openfire-4.0.0
-
 # Michał Górny <mgorny@gentoo.org> (11 Jan 2016)
 # (on behalf of Python team)
 # Masked for testing. python-exec now checks argv[0] to determine
@@ -63,10 +90,6 @@ dev-perl/ExtUtils-Constant
 media-libs/opengtl
 
 # Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Cannot be downloaded either mirrored, bug #561114. Removal in a month
-games-fps/doom3-mitm
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
 # Cannot be downloaded either mirrored, bug #561120. Removal in a month
 games-fps/ut2003-bonuspack-cm
 
@@ -304,10 +327,6 @@ dev-ada/florist
 app-admin/usermin
 
 # Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Unmaintained, cannot be downloaded, bug #537582. Removal in a month.
-sys-block/lsiutil
-
-# 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
@@ -379,12 +398,6 @@ app-i18n/scim-canna
 app-misc/lcd-stuff
 
 # Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Doesn't build with current kernels, lacks a maintainer to keep it patched
-# for compat with upcoming kernel versions too, bug #557422. Removal in a
-# month.
-app-laptop/nvidiabl
-
-# 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
 
@@ -492,11 +505,6 @@ net-misc/yaydl
 www-apps/gallery
 
 # Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Not compatible with latest gif, one of the last consumer of old imlib, bug
-# #486248. Removal in a month.
-app-office/magicpoint
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
 # Doesn't work with current twisted, bug #486810. Removal in a month.
 media-video/coherence
 
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index db2317948cf9..5f91c395682f 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -1,8 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 
+# Fabian Groffen <grobian@gentoo.org> (18 Jan 2016)
+# GNU attr isn't supported
+dev-libs/glib xattr
+
 # Fabian Groffen <grobian@gentoo.org> (10 Jan 2016)
 # libutempter isn't ported for Darwin, bug #506494
 net-misc/mosh utempter
diff --git a/profiles/prefix/sunos/solaris/package.use.mask b/profiles/prefix/sunos/solaris/package.use.mask
index 9e93227a9412..409502818dbd 100644
--- a/profiles/prefix/sunos/solaris/package.use.mask
+++ b/profiles/prefix/sunos/solaris/package.use.mask
@@ -1,8 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 
+# Fabian Groffen <grobian@gentoo.org> (16 Jan 2016)
+# GNU attr isn't supported
+dev-libs/glib xattr
+
 # Fabian Groffen <grobian@gentoo.org> (26 May 2015)
 # Avoid pulling in broken and unnecessary ossp-uuid, bug #324527
 dev-db/postgresql uuid
diff --git a/profiles/targets/desktop/kde/package.mask b/profiles/targets/desktop/kde/package.mask
new file mode 100644
index 000000000000..5c8edd181c1a
--- /dev/null
+++ b/profiles/targets/desktop/kde/package.mask
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Mask to avoid conflicts in kde profile
+kde-apps/kdeaccessibility-meta:5
+kde-apps/kdeadmin-meta:5
+kde-apps/kdeartwork-meta:5
+kde-apps/kdebase-meta:5
+kde-apps/kdeedu-meta:5
+kde-apps/kdegames-meta:5
+kde-apps/kdegraphics-meta:5
+kde-apps/kdemultimedia-meta:5
+kde-apps/kdenetwork-meta:5
+kde-apps/kdepim-meta:5
+kde-apps/kdesdk-meta:5
+kde-apps/kdetoys-meta:5
+kde-apps/kdeutils-meta:5
+kde-apps/kdewebdev-meta:5
+kde-apps/kde-apps-meta:5
+kde-apps/kde-meta:5
+kde-apps/kde-wallpapers:5
+kde-frameworks/oxygen-icons:5
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 93d5e35b1dfa..a1a44495d912 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -39,7 +39,7 @@ kde-apps/kde-wallpapers minimal
 kde-apps/kde4-l10n minimal
 kde-apps/kdeartwork-meta minimal
 kde-apps/kdebase-kioslaves minimal
-kde-apps/kdebase-meta minimal
+kde-apps/kdebase-meta:4 minimal
 kde-apps/kdebase-runtime-meta -crash-reporter minimal
 kde-apps/kdesu -handbook
 kde-apps/knetattach -handbook
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index eafefe94bfd0..61d347679bf2 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -1,2 +1,3 @@
 slotmove net-irc/kvirc 4 0
 move x11-apps/xtitle x11-misc/xtitle
+move kde-base/kde-meta kde-apps/kde-meta
diff --git a/sci-biology/allpathslg/allpathslg-52488.ebuild b/sci-biology/allpathslg/allpathslg-52488-r1.ebuild
index 4518cacee1ff..268d7594f9cc 100644
--- a/sci-biology/allpathslg/allpathslg-52488.ebuild
+++ b/sci-biology/allpathslg/allpathslg-52488-r1.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=6
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="De novo assembly of whole-genome shotgun microreads"
 # see also http://www.broadinstitute.org/software/allpaths-lg/blog/?page_id=12
@@ -16,13 +16,17 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="openmp"
 
-DEPEND="
-	dev-libs/boost
+RDEPEND="
 	!sci-biology/allpaths
 	!sci-biology/vaal"
-RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
 
-PATCHES=("${FILESDIR}/${P}_fix-buildsystem.patch" "${FILESDIR}/${P}_remove-namespace-std.patch")
+PATCHES=(
+	"${FILESDIR}/${P}_fix-buildsystem.patch"
+	"${FILESDIR}/${P}_remove-namespace-std.patch"
+)
 
 pkg_pretend() {
 	# as of release 44849, GCC 4.7.0 (or higher) is required
diff --git a/sci-biology/vaal/vaal-46233-r1.ebuild b/sci-biology/vaal/vaal-46233-r2.ebuild
index 20b3bf0de466..cb10e8e684c7 100644
--- a/sci-biology/vaal/vaal-46233-r1.ebuild
+++ b/sci-biology/vaal/vaal-46233-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$
 
@@ -17,11 +17,17 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="openmp"
 
-DEPEND=">=dev-libs/boost-1.41.0-r3"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	!sci-biology/allpaths
+	!sci-biology/allpathslg"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
 
 DOCS=( "${DISTDIR}/VAAL_manual.doc" )
-PATCHES=( "${FILESDIR}/${P}_remove-namespace-std.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}_remove-namespace-std.patch"
+)
 
 src_prepare() {
 	sed \
diff --git a/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild b/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild
index a07aef903771..45e8e4d1d91f 100644
--- a/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild
+++ b/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.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$
 
@@ -17,7 +17,7 @@ SRC_URI="${MY_P}.zip"
 
 LICENSE="CAVER"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-electronics/electric/electric-8.09.ebuild b/sci-electronics/electric/electric-8.09.ebuild
index fb6a52447db3..e636f9de69c5 100644
--- a/sci-electronics/electric/electric-8.09.ebuild
+++ b/sci-electronics/electric/electric-8.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 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="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/sci-electronics/electric/electric-8.11.ebuild b/sci-electronics/electric/electric-8.11.ebuild
index 01f2108f0718..6542e9224422 100644
--- a/sci-electronics/electric/electric-8.11.ebuild
+++ b/sci-electronics/electric/electric-8.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 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="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/sci-electronics/electric/electric-9.02.ebuild b/sci-electronics/electric/electric-9.02.ebuild
index 67b98d5d5500..e636f9de69c5 100644
--- a/sci-electronics/electric/electric-9.02.ebuild
+++ b/sci-electronics/electric/electric-9.02.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$
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/sci-electronics/electric/electric-9.03.ebuild b/sci-electronics/electric/electric-9.03.ebuild
index d2d3ab90d509..6542e9224422 100644
--- a/sci-electronics/electric/electric-9.03.ebuild
+++ b/sci-electronics/electric/electric-9.03.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$
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/sci-electronics/fritzing/metadata.xml b/sci-electronics/fritzing/metadata.xml
index 922de4e32044..f7538944066e 100644
--- a/sci-electronics/fritzing/metadata.xml
+++ b/sci-electronics/fritzing/metadata.xml
@@ -5,11 +5,6 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
-	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-		<description>CC him on bugs.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">fritzing/fritzing-app</remote-id>
 	</upstream>
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
index 79ade0ab62e2..7c51b051b5c7 100644
--- a/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 IUSE="doc examples fasttree fatlines judy lzma packed tcl"
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
index 0514ff1169b3..9aad01010c60 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 DEPEND="app-eselect/eselect-blas"
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
index 0d47b3f2f2af..a7f970fa223e 100644
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
 SLOT="0"
 LICENSE="public-domain"
 IUSE=""
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	virtual/blas
diff --git a/sci-libs/geos/geos-3.5.0.ebuild b/sci-libs/geos/geos-3.5.0.ebuild
index 745f6373f632..787c58215946 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/getdata/files/getdata-0.9.0-remove-python-test.patch b/sci-libs/getdata/files/getdata-0.9.0-remove-python-test.patch
new file mode 100644
index 000000000000..98da89dfb8ec
--- /dev/null
+++ b/sci-libs/getdata/files/getdata-0.9.0-remove-python-test.patch
@@ -0,0 +1,13 @@
+Remove python test suite.
+
+--- getdata-0.9.0/bindings/python/Makefile.am
++++ getdata-0.9.0/bindings/python/Makefile.am
+@@ -20,8 +20,6 @@
+ #
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS=test
+-
+ nodist_python_SCRIPTS = pygetdata.so
+ 
+ BUILT_SOURCES = pyconstants.c
diff --git a/sci-libs/getdata/getdata-0.9.0-r1.ebuild b/sci-libs/getdata/getdata-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..16e0ea55651f
--- /dev/null
+++ b/sci-libs/getdata/getdata-0.9.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
+
+PYTHON_COMPAT=( python2_7 )
+
+FORTRAN_STANDARD="95"
+FORTRAN_NEEDED=fortran
+
+inherit autotools eutils fortran-2 python-single-r1
+
+DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
+HOMEPAGE="http://getdata.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 cxx debug flac fortran lzma perl python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-python-test.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-idl \
+		--disable-matlab \
+		--disable-php \
+		$(use_enable cxx cplusplus) \
+		$(use_enable debug) \
+		$(use_enable fortran) \
+		$(use_enable fortran fortran95) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		--with-libz \
+		--without-libslim \
+		--without-libzzip \
+		$(use_with bzip2 libbz2) \
+		$(use_with flac libFLAC) \
+		$(use_with lzma liblzma) \
+		$(usex perl --with-perl-dir=vendor)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
index 9cf41e0401d2..90aa0494d030 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch b/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
new file mode 100644
index 000000000000..beb9dd4de815
--- /dev/null
+++ b/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
@@ -0,0 +1,62 @@
+Fix underlinking issues, caused by missing -lpython27 and -lpthread
+
+--- nlopt-2.4.2/configure.ac
++++ nlopt-2.4.2/configure.ac
+@@ -161,33 +161,17 @@
+ dnl Python:
+ AM_PATH_PYTHON([],[have_python=yes],[have_python=no])
+ if test $have_python = yes; then
+-  AC_ARG_VAR([PYTHON_CONFIG], [python-config program])
+-  AC_PATH_PROGS([PYTHON_CONFIG], [python$PYTHON_VERSION-config python-config],
+-                [unknown], [`dirname $PYTHON`:$PATH])
+-  AC_MSG_CHECKING([for Python include flags])
+-  if test "x$PYTHON_CONFIG" = "xunknown"; then
+-      pinc=-I`echo "import distutils.sysconfig; print (distutils.sysconfig.get_python_inc())" | $PYTHON - 2>/dev/null`
+-      test "x$pinc" = "x-I" && pinc=""
+-  else
+-      pinc=`$PYTHON_CONFIG --includes 2>/dev/null`
+-  fi
+-  AC_MSG_RESULT([${pinc:-unknown}])
+-  PYTHON_INCLUDES="$pinc"
+-  save_CPPFLAGS=$CPPFLAGS
+-  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+-  AC_CHECK_HEADER([Python.h], [], [AC_MSG_WARN([disabling Python wrappers]) 
+-                                   have_python=no])
+-  if test $have_python = yes; then
++  PKG_CHECK_MODULES([PYTHON], [python-2.7])
++  CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
++  
+     AC_MSG_CHECKING([for Numpy include directory])
+     pinc=`echo "import numpy; print (numpy.get_include())" | $PYTHON - 2>/dev/null`
+     AC_MSG_RESULT([${pinc:-unknown}])
+-    test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_INCLUDES -I$pinc"
++    test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_CFLAGS -I$pinc"
+     CPPFLAGS="$save_CPPFLAGS $PYTHON_INCLUDES"
+     AC_CHECK_HEADER([numpy/arrayobject.h],[],[
+       AC_MSG_WARN([disabling Python wrappers])
+       have_python=no],[#include <Python.h>])
+-  fi
+-  CPPFLAGS=$save_CPPFLAGS
+ fi
+ 
+ fi # with_python
+--- nlopt-2.4.2/swig/Makefile.am
++++ nlopt-2.4.2/swig/Makefile.am
+@@ -9,7 +9,7 @@
+ # Guile wrapper
+ 
+ libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
+-libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
++libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = -lpthread ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
+ libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+ libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_srcdir)/api
+ 
+@@ -23,7 +23,7 @@
+ # Python wrapper
+ 
+ _nlopt_la_SOURCES = nlopt-python.cpp
+-_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
++_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @PYTHON_LIBS@
+ _nlopt_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@
+ _nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_srcdir)/api
+ 
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch b/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
new file mode 100644
index 000000000000..c82d99497e67
--- /dev/null
+++ b/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
@@ -0,0 +1,49 @@
+Fix issues caused by Octave-4 renaming Octave_map to octave_map
+See also
+https://bugs.gentoo.org/show_bug.cgi?id=569996
+https://github.com/stevengj/nlopt/commit/5326ab410c978f9d8c3cae7e4917f55c10ef2c2e?diff=unified
+
+--- nlopt-2.4.2_old/octave/nlopt_optimize-oct.cc	2014-05-20 20:35:58.000000000 +0200
++++ nlopt-2.4.2/octave/nlopt_optimize-oct.cc	2016-01-09 16:10:53.358491776 +0100
+@@ -30,5 +30,5 @@
+ #include "nlopt_optimize_usage.h"
+ 
+-static int struct_val_default(Octave_map &m, const std::string& k,
++static int struct_val_default(octave_map &m, const std::string& k,
+ 				 int dflt)
+ {
+@@ -40,5 +40,5 @@
+ }
+ 
+-static double struct_val_default(Octave_map &m, const std::string& k,
++static double struct_val_default(octave_map &m, const std::string& k,
+ 				 double dflt)
+ {
+@@ -50,5 +50,5 @@
+ }
+ 
+-static Matrix struct_val_default(Octave_map &m, const std::string& k,
++static Matrix struct_val_default(octave_map &m, const std::string& k,
+ 				 Matrix &dflt)
+ {
+@@ -141,5 +141,5 @@
+ #define CHECK1(cond, msg) if (!(cond)) { fprintf(stderr, msg "\n\n"); nlopt_destroy(opt); nlopt_destroy(local_opt); return NULL; }
+ 
+-nlopt_opt make_opt(Octave_map &opts, int n)
++nlopt_opt make_opt(octave_map &opts, int n)
+ {
+   nlopt_opt opt = NULL, local_opt = NULL;
+@@ -196,5 +196,5 @@
+ 	  && (opts.contents("local_optimizer"))(0).is_map(),
+ 	  "opt.local_optimizer must be a structure");
+-    Octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
++    octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
+     CHECK1((local_opt = make_opt(local_opts, n)), 
+ 	  "error initializing local optimizer");
+@@ -217,5 +217,5 @@
+ 
+   CHECK(args(0).is_map(), "opt must be structure")
+-  Octave_map opts = args(0).map_value();
++  octave_map opts = args(0).map_value();
+ 
+   CHECK(args(1).is_real_matrix() || args(1).is_real_scalar(),
diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..97662c0dce5a
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit python-r1 autotools-utils
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="http://ab-initio.mit.edu/nlopt/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DEPEND="
+	guile? ( dev-scheme/guile:* )
+	octave? ( sci-mathematics/octave )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-pkgconfig.patch
+	"${FILESDIR}"/${PN}-2.3-as-needed.patch
+	"${FILESDIR}"/${P}-fix-dynamic-underlinking.patch
+)
+
+src_prepare() {
+	# fix #569996 due to renaming of Octave_map class
+	has_version ">=sci-mathematics/octave-4.0" && \
+		epatch "${FILESDIR}/${P}-octave-4-map.patch"
+	autotools-utils_src_prepare
+	use cxx && BUILD_CXX="${S}_cxx"
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with octave)
+	)
+	if use octave; then
+		export OCT_INSTALL_DIR="$(octave-config -p LOCALOCTFILEDIR)"
+		export M_INSTALL_DIR="$(octave-config -p LOCALFCNFILEDIR)"
+	else
+		export MKOCTFILE=None
+	fi
+
+	myeconfargs+=(
+		$(use_with guile)
+	)
+
+	if use python; then
+		python_foreach_impl run_in_build_dir autotools-utils_src_configure
+	else
+		autotools-utils_src_configure
+	fi
+
+	if use cxx; then
+		myeconfargs+=( --with-cxx --without-octave --without-python )
+		BUILD_DIR="${BUILD_CXX}" autotools-utils_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir autotools-utils_src_compile
+	else
+		autotools-utils_src_compile
+	fi
+	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_compile
+	#-C "${BUILD_DIR}_cxx"
+}
+
+src_test() {
+	do_test() {
+		local a f
+		cd "${BUILD_DIR}"/test
+		for a in {1..7}; do
+			for f in {5..9}; do
+				./testopt -a $a -o $f || die "algorithm $a function $f failed"
+			done
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_test
+	else
+		do_test
+	fi
+	cd "${BUILD_CXX}"/test
+	for a in {1..9}; do
+		for f in {5..9}; do
+			./testopt -a $a -o $f || die "algorithm $a function $f failed"
+		done
+	done
+}
+
+src_install() {
+	# build cxx first so the c lib overwrites the pc file
+	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_install
+	if use python; then
+		python_foreach_impl run_in_build_dir autotools-utils_src_install
+	else
+		autotools-utils_src_install
+	fi
+	local r
+	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
index 704d5abd7f28..74f324e782ad 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos"
 IUSE="static-libs"
 
 RDEPEND="virtual/lapack"
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index 409fda83a098..9a17122b9bf3 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,3 +1,2 @@
-DIST udunits-2.1.15.tar.gz 1056530 SHA256 9f89196c3ffa5a4edebb944e17b38c7b20dc16b546311ea54272494b3c4b036d SHA512 bffd2cd788906b592a1c03ef3162c432c6b88aeb82dd67cccfe31f22eafe9ee55784328ad35eac9c13e0992f67921745930a2e16b12d4dc41c403f6877977815 WHIRLPOOL ac75641dea0182941cadf621daa12441617dd6d227dbfcb1cd819e8e69be1bf1a835996ae22f4902a52f853a5f9ab680b5a27540b061a95b61d7484fe029de7c
 DIST udunits-2.1.24.tar.gz 1059344 SHA256 2e5fa4583031b26404a68167b38a11773872486f3c342fdde1e48c52a86e0ed0 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e WHIRLPOOL 3c0bf81216553c00d1d37c6f5542496385d9b3cde2b14683e0fe6aaf85f62b50f49923e2239f2616635a53a7c4df9070db1001c7261b00cd51751a99c8870104
 DIST udunits-2.2.20.tar.gz 1002380 SHA256 f10a02014bc6a200d50d8719997bb3a6b3d364de688469d2f7d599688dd9d195 SHA512 5d5803d9c2cbfdba7c760739f522680e3e69921256119af83e139a36fbcb4d7c84e044661f2987e3422f1eea548abaf4f585946643e8db36cd1d7065b86f8737 WHIRLPOOL 9816092de3ef12ed5b721f41ac55ce1bb8ac61d687f458520c0d9322ad6b3b3e7e07b298c8364e22d70bdec996fbfc10b959b5008141169964bd05060f39ace0
diff --git a/sci-libs/udunits/udunits-2.1.15.ebuild b/sci-libs/udunits/udunits-2.1.15.ebuild
deleted file mode 100644
index 826a9fee8e84..000000000000
--- a/sci-libs/udunits/udunits-2.1.15.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=2
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-Unidata"
-IUSE="doc"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# respect user's flags, compile with system libexpat
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	rm -rf expat
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGE_LOG ANNOUNCEMENT
-	doinfo udunits2.info prog/udunits2prog.info
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins udunits2.html udunits2.pdf
-		doins prog/udunits2prog.html prog/udunits2prog.pdf
-	fi
-}
diff --git a/sci-libs/udunits/udunits-2.1.24-r1.ebuild b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
index 39ffa6fc1538..bc88815fed4c 100644
--- a/sci-libs/udunits/udunits-2.1.24-r1.ebuild
+++ b/sci-libs/udunits/udunits-2.1.24-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$
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="UCAR-Unidata"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/expat"
diff --git a/sci-libs/udunits/udunits-2.1.24.ebuild b/sci-libs/udunits/udunits-2.1.24.ebuild
deleted file mode 100644
index 85791188cfdc..000000000000
--- a/sci-libs/udunits/udunits-2.1.24.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=4
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-Unidata"
-IUSE="doc static-libs"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# respect user's flags, compile with system libexpat
-	epatch "${FILESDIR}"/${PN}-2.1.15-autotools.patch
-	rm -rf expat
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc CHANGE_LOG ANNOUNCEMENT
-	doinfo udunits2.info prog/udunits2prog.info
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins udunits2.html udunits2.pdf
-		doins prog/udunits2prog.html prog/udunits2prog.pdf
-	fi
-}
diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild
index 05c6b1516b6b..8ad410c0c861 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/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
index b498a18babee..80feeaef14f5 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.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$
 
@@ -132,16 +132,19 @@ die_compiler() {
 # $3 - clang++
 # $4 - icc/icpc
 check_compiler() {
-	local ver
+	local cur ver
 	case "$(tc-getCXX)" in
 		*clang++*)
 			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
+			cur="$3"
 		;;
 		*g++*)
 			ver="$(gcc-version)"
+			cur="$2"
 		;;
 		*icc*|*icpc*)
 			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
+			cur="$4"
 		;;
 		*)
 			ewarn "You are using an unsupported compiler."
@@ -149,7 +152,7 @@ check_compiler() {
 			return 0
 		;;
 	esac
-	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
+	version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
 }
 
 pkg_setup() {
diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild
index 915e7123c314..2fb31dcb9382 100644
--- a/sci-physics/root/root-5.34.32.ebuild
+++ b/sci-physics/root/root-5.34.32.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,16 +126,19 @@ die_compiler() {
 # $3 - clang++
 # $4 - icc/icpc
 check_compiler() {
-	local ver
+	local cur ver
 	case "$(tc-getCXX)" in
 		*clang++*)
 			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
+			cur="$3"
 		;;
 		*g++*)
 			ver="$(gcc-version)"
+			cur="$2"
 		;;
 		*icc*|*icpc*)
 			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
+			cur="$4"
 		;;
 		*)
 			ewarn "You are using an unsupported compiler."
@@ -143,7 +146,7 @@ check_compiler() {
 			return 0
 		;;
 	esac
-	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
+	version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
 }
 
 pkg_setup() {
diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild
index 0ce7393b96be..a410d12296b9 100644
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-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$
 
@@ -132,18 +132,39 @@ die_compiler() {
 # $3 - clang++
 # $4 - icc/icpc
 check_compiler() {
-	local ver
+	local cur ver
 	case "$(tc-getCXX)" in
 		*clang++*)
 			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
+			cur="$3"
 		;;
 		*g++*)
 			ver="$(gcc-version)"
+			# gcc-5 is not yet supported, bug 564306
+			if version_is_at_least "5" "${ver}"; then
+				eerror ""
+				eerror "GCC-5 is not yet supported in ROOT-6."
+				eerror "The code may build for you, but will have run-time failures."
+				eerror "See the following bugs:"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7285"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7319"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7654"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7721"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7818"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7895"
+				eerror "https://bugs.gentoo.org/show_bug.cgi?id=564306"
+				eerror ""
+				eerror "Please use GCC-4.9 for now."
+				eerror ""
+				die "gcc-5 is not yet supported"
+			fi
+			cur="$2"
 		;;
 		*icc*|*icpc*)
 			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
 			eerror "ROOT-6 is known not to build with ICC."
 			eerror "Please report any isuses upstream."
+			cur="$4"
 		;;
 		*)
 			ewarn "You are using an unsupported compiler."
@@ -151,7 +172,7 @@ check_compiler() {
 			return 0
 		;;
 	esac
-	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
+	version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
 }
 
 pkg_setup() {
diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild
index f498a73c472f..c3ef6fb100cd 100644
--- a/sci-physics/root/root-6.04.06.ebuild
+++ b/sci-physics/root/root-6.04.06.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$
 
@@ -127,18 +127,38 @@ die_compiler() {
 # $3 - clang++
 # $4 - icc/icpc
 check_compiler() {
-	local ver
+	local cur ver
 	case "$(tc-getCXX)" in
 		*clang++*)
 			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
+			cur="$3"
 		;;
 		*g++*)
 			ver="$(gcc-version)"
+			if version_is_at_least "5" "${ver}"; then
+				eerror ""
+				eerror "GCC-5 is not yet supported in ROOT-6."
+				eerror "The code may build for you, but will have run-time failures."
+				eerror "See the following bugs:"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7285"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7319"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7654"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7721"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7818"
+				eerror "https://sft.its.cern.ch/jira/browse/ROOT-7895"
+				eerror "https://bugs.gentoo.org/show_bug.cgi?id=564306"
+				eerror ""
+				eerror "Please use GCC-4.9 for now."
+				eerror ""
+				die "gcc-5 is not yet supported"
+			fi
+			cur="$2"
 		;;
 		*icc*|*icpc*)
 			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
 			eerror "ROOT-6 is known not to build with ICC."
 			eerror "Please report any isuses upstream."
+			cur="$4"
 		;;
 		*)
 			ewarn "You are using an unsupported compiler."
@@ -146,7 +166,7 @@ check_compiler() {
 			return 0
 		;;
 	esac
-	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
+	version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
 }
 
 pkg_setup() {
diff --git a/sys-apps/fwts/metadata.xml b/sys-apps/fwts/metadata.xml
index cfeca1024cfd..760f41d16247 100644
--- a/sys-apps/fwts/metadata.xml
+++ b/sys-apps/fwts/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
diff --git a/sys-apps/fxload/metadata.xml b/sys-apps/fxload/metadata.xml
index 7dbc2f2a420a..a4278fff2457 100644
--- a/sys-apps/fxload/metadata.xml
+++ b/sys-apps/fxload/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linux-hotplug</remote-id>
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index e321b24f0a9b..bb356d429dad 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,5 +1,3 @@
-DIST man-db-2.6.6.tar.xz 1448576 SHA256 7da90f8d8df91e0e682769d50f4bdb905f525b5d0f01e7e5b8cc3c6da45f66c3 SHA512 7abb8609e1113dd1852076c4c71557c3b376fefa7e42fa39198f7b882f4b3fe733983045742c4b3903be2c953c09c724f735619b4396283a4ed2ad7816aaf4ec WHIRLPOOL e5c7b41afd7374bb1df3024134f9bd8a1af42b5ad63d4e516e946b0e8ccc88bafc055fdba707b0c764030e92748b225a72672bfe07e2bc3e8d78526d17f5ff72
-DIST man-db-2.6.7.1.tar.xz 1452280 SHA256 8d65559838fccca774e3ef7c15c073180c786e728785c735e136297facca41fc SHA512 91e1036701174c5623a4cf4208a93130822dc9c61ffd9c6bf0dddaf7c4c5b2401e6238f60578dfa81a11d67d360cbc4d45af920542fb4a0624c7169b17a618f8 WHIRLPOOL 30c510289d1444b3231704c22ddf2c17b58d4aa8b9e8a94552537fbc971b23f16b2c43a32fa9f85fb7b8eca2fd71a73d52955fcd0ab24ef49d3903832eafecf7
 DIST man-db-2.7.2.tar.xz 1501264 SHA256 22674eaf51dce8bcc83fd86b1c8d11f99de5c6d8962d7fad7b02307c4ad6e492 SHA512 fd0659f002980ba902bcd1186de09f82d840b039cbeea3457377926991ce5aaa602fe228c0969ea643140a4d5e7bdfbdab7c747943ac93b51c17a591677a7b84 WHIRLPOOL 51ad5e4580b5ff9ede9a0c2e17d579ed2a14c5ef1b11a43b92f99e5467db3e1627eed58c76040710e6fb7ae24258a4904142db8951c21e0981318082710dd772
 DIST man-db-2.7.4.tar.xz 1503972 SHA256 153f4d3c33f5f9b0c8484bb39d9d271f6ae4aa1b3f5d6d515879692dba944f0b SHA512 979f4b8380a57d2e7275095a31903c112c36558aba33f5d3c26d5bbb5d846c3dae11b943a32db8a5cd9af34605558329666c3830e932a81af8647c370f509139 WHIRLPOOL 7ad145e7b6f04707059b31c7a01c931d4b9f3fb0d638f8c17f91f6f249d91b9121a2d22b0a4115dffb41949cf60e4d8c5e940f6fb39257cf7bcfbdf03885e7a7
 DIST man-db-2.7.5.tar.xz 1505428 SHA256 5c4ddd0d67abbbcb408dc5804906f62210f7c863ef791198faca3d75681cca14 SHA512 8e82fb437372261a2b33e1acb45b6322dac1864f13b20968d6a09b27edec795111c25bafcb7f6f3550784d4621eb4871f76d0275d7fa9e01644a5ced60666933 WHIRLPOOL c9322b8a816f9eeab974172827adbc93e1c6ee973c6af9049e370d1cefdb1d6cc4bb29383ed609e8567ac98052fb195887096e511b734688012cd7250d66466e
diff --git a/sys-apps/man-db/man-db-2.6.6.ebuild b/sys-apps/man-db/man-db-2.6.6.ebuild
deleted file mode 100644
index 3c9d1959730e..000000000000
--- a/sys-apps/man-db/man-db-2.6.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils user
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
-IUSE="berkdb +gdbm nls selinux static-libs zlib"
-
-CDEPEND="dev-libs/libpipeline
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
-	sys-apps/groff
-	zlib? ( sys-libs/zlib )
-	!sys-apps/man"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mandb )
-"
-
-pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--enable-setuid \
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	prune_libtool_files
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron man-db #289884
-
-	keepdir /var/cache/man
-	fowners man:0 /var/cache/man
-	fperms 2755 /var/cache/man
-}
-
-pkg_preinst() {
-	if [[ -f ${EROOT}var/cache/man/whatis ]] ; then
-		einfo "Cleaning ${EROOT}var/cache/man from sys-apps/man"
-		find "${EROOT}"var/cache/man -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-	if [[ ! -g ${EROOT}var/cache/man ]] ; then
-		einfo "Resetting permissions on ${EROOT}var/cache/man" #447944
-		mkdir -p "${EROOT}var/cache/man"
-		chown -R man:0 "${EROOT}"var/cache/man
-		find "${EROOT}"var/cache/man -type d '!' -perm /g=s -exec chmod 2755 {} +
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.6.7.1.ebuild b/sys-apps/man-db/man-db-2.6.7.1.ebuild
deleted file mode 100644
index 5d3dccdba664..000000000000
--- a/sys-apps/man-db/man-db-2.6.7.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils user
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="berkdb +gdbm nls selinux static-libs zlib"
-
-CDEPEND=">=dev-libs/libpipeline-1.3.0
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
-	sys-apps/groff
-	zlib? ( sys-libs/zlib )
-	!sys-apps/man"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mandb )
-"
-
-pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--enable-setuid \
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	prune_libtool_files
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron man-db #289884
-
-	keepdir /var/cache/man
-	fowners man:0 /var/cache/man
-	fperms 2755 /var/cache/man
-}
-
-pkg_preinst() {
-	if [[ -f ${EROOT}var/cache/man/whatis ]] ; then
-		einfo "Cleaning ${EROOT}var/cache/man from sys-apps/man"
-		find "${EROOT}"var/cache/man -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-	if [[ ! -g ${EROOT}var/cache/man ]] ; then
-		einfo "Resetting permissions on ${EROOT}var/cache/man" #447944
-		mkdir -p "${EROOT}var/cache/man"
-		chown -R man:0 "${EROOT}"var/cache/man
-		find "${EROOT}"var/cache/man -type d '!' -perm /g=s -exec chmod 2755 {} +
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.7.2.ebuild b/sys-apps/man-db/man-db-2.7.2.ebuild
index 583e9935ea5b..efca6fe24059 100644
--- a/sys-apps/man-db/man-db-2.7.2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="berkdb +gdbm nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/man-db/man-db-2.7.5.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild
index bf66d3865377..5af150cd4fae 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/openrc/openrc-0.13.11.ebuild b/sys-apps/openrc/openrc-0.13.11.ebuild
index 098b4e039bf1..e05995db793f 100644
--- a/sys-apps/openrc/openrc-0.13.11.ebuild
+++ b/sys-apps/openrc/openrc-0.13.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$
 
@@ -19,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+IUSE="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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.14.ebuild b/sys-apps/openrc/openrc-0.14.ebuild
index f1c78ac2cb42..bdc3b2410503 100644
--- a/sys-apps/openrc/openrc-0.14.ebuild
+++ b/sys-apps/openrc/openrc-0.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$
 
@@ -19,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.15.1.ebuild b/sys-apps/openrc/openrc-0.15.1.ebuild
index f1c78ac2cb42..bdc3b2410503 100644
--- a/sys-apps/openrc/openrc-0.15.1.ebuild
+++ b/sys-apps/openrc/openrc-0.15.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$
 
@@ -19,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.15.ebuild b/sys-apps/openrc/openrc-0.15.ebuild
index f1c78ac2cb42..bdc3b2410503 100644
--- a/sys-apps/openrc/openrc-0.15.ebuild
+++ b/sys-apps/openrc/openrc-0.15.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,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.16.1.ebuild b/sys-apps/openrc/openrc-0.16.1.ebuild
index f1c78ac2cb42..bdc3b2410503 100644
--- a/sys-apps/openrc/openrc-0.16.1.ebuild
+++ b/sys-apps/openrc/openrc-0.16.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$
 
@@ -19,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.16.2.ebuild b/sys-apps/openrc/openrc-0.16.2.ebuild
index f1c78ac2cb42..bdc3b2410503 100644
--- a/sys-apps/openrc/openrc-0.16.2.ebuild
+++ b/sys-apps/openrc/openrc-0.16.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,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.16.3.ebuild b/sys-apps/openrc/openrc-0.16.3.ebuild
index f1c78ac2cb42..bdc3b2410503 100644
--- a/sys-apps/openrc/openrc-0.16.3.ebuild
+++ b/sys-apps/openrc/openrc-0.16.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$
 
@@ -19,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.16.4.ebuild b/sys-apps/openrc/openrc-0.16.4.ebuild
index c7bfad1247d6..bffc891d4ddc 100644
--- a/sys-apps/openrc/openrc-0.16.4.ebuild
+++ b/sys-apps/openrc/openrc-0.16.4.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,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.16.ebuild b/sys-apps/openrc/openrc-0.16.ebuild
index f1c78ac2cb42..bdc3b2410503 100644
--- a/sys-apps/openrc/openrc-0.16.ebuild
+++ b/sys-apps/openrc/openrc-0.16.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,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.17.ebuild b/sys-apps/openrc/openrc-0.17.ebuild
index c7bfad1247d6..bffc891d4ddc 100644
--- a/sys-apps/openrc/openrc-0.17.ebuild
+++ b/sys-apps/openrc/openrc-0.17.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,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.18.3.ebuild b/sys-apps/openrc/openrc-0.18.3.ebuild
index 4575415445ae..1026f48917fb 100644
--- a/sys-apps/openrc/openrc-0.18.3.ebuild
+++ b/sys-apps/openrc/openrc-0.18.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$
 
@@ -19,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.18.4.ebuild b/sys-apps/openrc/openrc-0.18.4.ebuild
index 4c3e4758ff11..dede08015ec4 100644
--- a/sys-apps/openrc/openrc-0.18.4.ebuild
+++ b/sys-apps/openrc/openrc-0.18.4.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,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.19.1.ebuild b/sys-apps/openrc/openrc-0.19.1.ebuild
index 29efb42afcae..4a580f9741bb 100644
--- a/sys-apps/openrc/openrc-0.19.1.ebuild
+++ b/sys-apps/openrc/openrc-0.19.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$
 
@@ -14,16 +14,15 @@ 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"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-0.20.2.ebuild b/sys-apps/openrc/openrc-0.20.2.ebuild
index bf25fc4e965d..41ac4e9ff0ef 100644
--- a/sys-apps/openrc/openrc-0.20.2.ebuild
+++ b/sys-apps/openrc/openrc-0.20.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,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index bf25fc4e965d..41ac4e9ff0ef 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-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$
 
@@ -19,11 +19,10 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+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 ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? (
 		sys-auth/pambase
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index cc1091304cef..3c4e861741be 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -2,3 +2,4 @@ DIST paludis-1.4.2.tar.bz2 1791385 SHA256 ac342d908572e97968abcdd806ba9f390585a0
 DIST paludis-2.0.0.tar.bz2 1787616 SHA256 9e635d86e655658d31adde5813f5fcad2982b5fe8847c3c565eca7d28a1ec639 SHA512 e1df4d0617b4e021d1b63181517c0ecb9ece55669226c6ea0bba318b6899277c09a8d8ccc11ef673a3f27e77302c84702df4ae7568b44a87e0b138e346623728 WHIRLPOOL 90dcd765ebc864d14e569a01071fe3effae3c4424cf7f3004ce1f273c721c512697c6100e3b775d34732640bd770220fe5304f4d2b5e67f2de86c9f04c9ffe97
 DIST paludis-2.2.0.tar.bz2 1786405 SHA256 0b0bcb14a6539874d274c72e6a7b9825aa80fa083c2b61e1d5b14daf24829346 SHA512 9b4dd4613ec31683021d6fc5b5eb094024ceada47c41e09d1f0cb86f1de5b621869756401ba14ec0ec5f5dd20a5f8bf5b596c3891724bb9c245400b5fef4961f WHIRLPOOL 9cd602561b38e1bb6fc3d9baa5452c63a394c1e51faf299d8d1e82dad9a53969f14be542dac3f90974fcdf08c16c267cfdf45273c5244f378f9a2b7b6288bd97
 DIST paludis-2.4.0.tar.bz2 1787689 SHA256 f47b4bb5503dc127022453b15ca811dec22ee2f04c3c3b76ed1c5a83dbe1af1f SHA512 5fbb15d2285c892fdf19288b8838c51ec2439817a9abc685b8692ff4a3ddf76632d3ab51b2e0298c8eacf00f8b00f4e66b47b34db12844cd4eb77cbfb87ca32e WHIRLPOOL d9dc107886b8bf09bb203704d559dd030190b8390607964578c3f2e10a5c5cd4400146ffed894a968143761fc8149796d37597274b34b8414133b26c7252345b
+DIST paludis-2.4.0_p20160112.tar.xz 1296724 SHA256 2b209337b6a4667ffe8b3db431a88314b3b224cf0f9d57a6d4fdd8c2c00f4b19 SHA512 898853bf75e60dcfcb8aca7e45da3b7eeec2bb119db5b77a12e876282abe936bb3064bf52c27b7a7a949ab0865e7fbbfea78dc66408a09d00a02e1a2069153ae WHIRLPOOL 5167ad0d234f874ef304e0725ea78517c7bcd2e0ef09b5e8ac6b6cf4213fcbccd3b6057caf89274ed67bfd7b35efa0f33fc82d479f5b5f31937a0b7c48c37777
diff --git a/sys-apps/paludis/paludis-2.4.0_p20160112.ebuild b/sys-apps/paludis/paludis-2.4.0_p20160112.ebuild
new file mode 100644
index 000000000000..ef55347c6f8e
--- /dev/null
+++ b/sys-apps/paludis/paludis-2.4.0_p20160112.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+# matching profile defaults for now
+RUBY_VER=2.0
+
+inherit bash-completion-r1 eutils python-single-r1 user
+
+DESCRIPTION="paludis, the other package mangler"
+HOMEPAGE="http://paludis.exherbo.org/"
+SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+IUSE="doc pbins pink python ruby search-index test +xml"
+LICENSE="GPL-2 vim"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=app-admin/eselect-1.2.13
+	>=app-shells/bash-3.2
+	dev-libs/libpcre[cxx]
+	sys-apps/file
+	pbins? ( >=app-arch/libarchive-3.1.2 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/boost-1.41.0[python,${PYTHON_USEDEP}] )
+	ruby? ( dev-lang/ruby:${RUBY_VER} )
+	search-index? ( >=dev-db/sqlite-3 )
+	xml? ( >=dev-libs/libxml2-2.6 )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=app-text/asciidoc-8.6.3
+	app-text/htmltidy
+	app-text/xmlto
+	>=sys-devel/gcc-4.7
+	doc? (
+		|| (
+			>=app-doc/doxygen-1.5.3
+			<=app-doc/doxygen-1.5.1 )
+		python? (
+		dev-python/sphinx[${PYTHON_USEDEP}] )
+		ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] )
+	)
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.6.0-r1 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/sandbox"
+
+PDEPEND="app-eselect/eselect-package-manager"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if id paludisbuild >/dev/null 2>/dev/null ; then
+			if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
+				eerror "The 'paludisbuild' user is now expected to be a member of the"
+				eerror "'tty' group. You should add the user to this group before"
+				eerror "upgrading Paludis."
+				die "Please add paludisbuild to tty group"
+			fi
+		fi
+	fi
+
+}
+
+pkg_setup() {
+	enewgroup "paludisbuild"
+	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix the script shebang on Ruby scripts.
+	# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
+	sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=(
+		--htmldir=/usr/share/doc/${PF}/html
+
+		$(use_enable doc doxygen)
+		$(use_enable test gtest)
+		$(use_enable pbins)
+		$(use_enable pink)
+		$(use_enable python)
+		$(use python && use_enable doc python-doc)
+		$(use_enable ruby)
+		$(use ruby && use_enable doc ruby-doc)
+		--with-ruby-version="${RUBY_VER}"
+		$(use_enable search-index)
+		$(use_enable xml)
+
+		--enable-vim
+		--with-config-framework=eselect
+		--with-environments=default,portage
+		--with-vim-install-dir=/usr/share/vim/vimfiles
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	dobashcomp bash-completion/cave
+
+	insinto /usr/share/zsh/site-functions
+	doins zsh-completion/_cave
+}
+
+src_test() {
+	# Work around Portage bugs
+	local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
+	local -x BASH_ENV=/dev/null
+
+	if [[ ${EUID} == 0 ]] ; then
+		# hate
+		local -x PALUDIS_REDUCED_UID=0
+		local -x PALUDIS_REDUCED_GID=0
+	fi
+
+	if ! nonfatal emake -k check ; then
+		eerror "Tests failed. Looking for files for you to add to your bug report..."
+		find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
+			eerror "    $a"
+		done
+		die "Make check failed"
+	fi
+}
+
+pkg_postinst() {
+	local pm
+	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
+		pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" )
+	fi
+
+	if [[ ${pm} != paludis ]] ; then
+		elog "If you are using paludis or cave as your primary package manager,"
+		elog "you should consider running:"
+		elog "    eselect package-manager set paludis"
+	fi
+}
diff --git a/sys-apps/paludis/paludis-9999.ebuild b/sys-apps/paludis/paludis-9999.ebuild
index 911a00d657f2..d61f74ae79cb 100644
--- a/sys-apps/paludis/paludis-9999.ebuild
+++ b/sys-apps/paludis/paludis-9999.ebuild
@@ -67,16 +67,6 @@ pkg_pretend() {
 			fi
 		fi
 	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4
-			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ) ]]
-		then
-			eerror "Paludis requires at least gcc 4.7 to build. Please switch the active"
-			eerror "gcc version using gcc-config."
-			die "Paludis requires at least gcc 4.7"
-		fi
-	fi
 }
 
 pkg_setup() {
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index ed12f0835168..5e72c4c3f54b 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -68,7 +68,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	insinto /usr/share/zsh/site-functions
-	doins shell/zsh-completion/*
+	doins shell/zsh/completion/*
 }
 
 pkg_postinst() {
diff --git a/sys-apps/portage/portage-2.2.26.ebuild b/sys-apps/portage/portage-2.2.26.ebuild
index 0b260b191bee..b12a8fecdb29 100644
--- a/sys-apps/portage/portage-2.2.26.ebuild
+++ b/sys-apps/portage/portage-2.2.26.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 38fb2eadbe8a..fa19c3f10825 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,8 +1,4 @@
-DIST sandbox-1.6.tar.lzma 307014 SHA256 52cfd286da3d5d51f3b6e012e409e931b21e32b4f2f16ba5677e46328680f4f4 SHA512 f470599a67443fa107612fef1cc73b64b3146003ae21bb5ae5abd852c4c37aec93ac09be646fda9d55d4c3aeef0cf28a42fa675f2acbb53c1d903e400538ba4c WHIRLPOOL 7c7fbe57cc831d0eb7853476e264a85bb8113620948e761563a872d3d55fd3c0ff063332397199001ea9dcb8258f348b827f337b876b2a26f727f10abbc8f712
 DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192
-DIST sandbox-2.3.tar.xz 344260 SHA256 8670f7508453c2fd300ca29ad2eb457691c3df01c4c22fa27d4a7c880fd291d5 SHA512 06ddaa6dc0822474c263650e95284af6cb69c60c9443b5caaf95af8140283f937d5594849064847fe3a4ad89b29b6ef6d6e909a9b85bb5d7fcf8b427d0e9c7e4 WHIRLPOOL 5d3f45a0bbb1aeffb8c83f8978bea65764aa438a5abcb50c66b5f66232d972bde84013694f6806fcc0026cd6d37420c69655d66ec5984a1c6f71a68dcfc95d11
-DIST sandbox-2.4.tar.xz 344664 SHA256 450599cb3052296d42f81a04dbbda82d220415fc2d16f5dc6e26b042d580fd3e SHA512 c0f8b789bcabd48e03a20a97c9daa82c48f264d7641ecfa51dff7a2d2c34be398cf1db6235eb0211bf0fa78b07bd6e633e06bc102904bf9dd8a95f9fde1ca615 WHIRLPOOL 22f0f55f6e638275781ab5afa29b1a7f5e7f3335a3d2ff37d9fcce0bf9284b271bf1d69b98bcd4b06fdb9ff1528d044f9fb111a58c2a1a5ce33cbe28c0cb869d
-DIST sandbox-2.5.tar.xz 355680 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a SHA512 7b870295bb78c1da5550b650a3983d93e503935a8e8452a29a5c6310cc2c2d569a898ea1534e2c670b4a3e5607504fac55f69da6878e0adc9c2c65a5476b4fb0 WHIRLPOOL 887d36638111b09d77674002c07ebad84c24bc4f645d9fb78e180a6c6e7407eb3fb6857877bc152e0cefb676f01df60b20857b8487ce28ff3e4438aef744fe53
 DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03
 DIST sandbox-2.7.tar.xz 390304 SHA256 d6e1230180d84fb64c9788dd372a73a1cd2496ead91cad333a211320d3041149 SHA512 81056460afabe3f9163594f662f5faf87b6dfe8511a001fc4d6ce0171492eb29f3b645a45320032d34475bb2c24bf212d1d05b50878a340f1e2ca580f8f8f38a WHIRLPOOL ad070df6351537e49f939ba195f27ccf5e4566bb8b6e4ba391ab8174771eacf909571284c6fa873d5b55e8540605d2766a3de5d451b6af132c0ff6d96e43f554
 DIST sandbox-2.8.tar.xz 410588 SHA256 f01dcac27a4641d1898c4a19bf3a0572f8ec85c3ba12e6ede8af36f6bc047165 SHA512 73a21e72f5825f43ee887efbe73f4ccd8771c7f45438104077aa83448d0a2727ab65be89a7a1a690d3662594df680ca4dc29908763e5abe2a81594b6f8f6ff2e WHIRLPOOL 6c93a0d8737bab4e710f0f20645514c9a5413a2d357a64c2e8b8428567221b949134881e705f979aa374635a278c0b3c646a6cffaf1015024db8f2aab2ec7c74
diff --git a/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch b/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch
deleted file mode 100644
index 490bc41c0eed..000000000000
--- a/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://bugs.gentoo.org/263657
-
-disable pthread locks ... this is how stable has always worked, so there
-wont be any regressions ...
-
-diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c
-index 034d0e7..595d17f 100644
---- a/libsandbox/libsandbox.c
-+++ b/libsandbox/libsandbox.c
-@@ -814,9 +814,6 @@
- 	return result;
- }
- 
--/* Need to protect the global sbcontext structure */
--static pthread_mutex_t sb_syscall_lock = PTHREAD_MUTEX_INITIALIZER;
--
- bool before_syscall(int dirfd, int sb_nr, const char *func, const char *file, int flags)
- {
- 	int old_errno = errno;
-@@ -843,8 +840,6 @@
- 		file = at_file_buf;
- 	}
- 
--	pthread_mutex_lock(&sb_syscall_lock);
--
- 	if (!sb_init) {
- 		init_context(&sbcontext);
- 		sb_init = true;
-@@ -885,8 +880,6 @@
- 
- 	result = check_syscall(&sbcontext, sb_nr, func, file, flags);
- 
--	pthread_mutex_unlock(&sb_syscall_lock);
--
- 	if (0 == result) {
- 		if ((NULL != getenv(ENV_SANDBOX_PID)) && (is_env_on(ENV_SANDBOX_ABORT)))
- 
diff --git a/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch b/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch
deleted file mode 100644
index 754ef01968c9..000000000000
--- a/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-sandbox-1.7 traces static apps so disable the qa notice as it just scares
-users ... dont want scary stuff in stable!
-
---- libsandbox/wrapper-funcs/__wrapper_exec.c
-+++ libsandbox/wrapper-funcs/__wrapper_exec.c
-@@ -221,7 +221,6 @@
- 		if (!FUNCTION_SANDBOX_SAFE(path))
- 			return result;
- 
--		sb_check_exec(path, argv);
- 	}
- #endif
- 
diff --git a/sys-apps/sandbox/sandbox-1.6-r2.ebuild b/sys-apps/sandbox/sandbox-1.6-r2.ebuild
deleted file mode 100644
index d59b16e7bdee..000000000000
--- a/sys-apps/sandbox/sandbox-1.6-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.lzma
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-EMULTILIB_PKG="true"
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES=-sandbox emerge sandbox"
-}
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-disable-qa-static.patch
-	epatch "${FILESDIR}"/${P}-disable-pthread.patch
-	epatch "${FILESDIR}"/0001-libsandbox-handle-more-at-functions.patch
-}
-
-src_compile() {
-	filter-lfs-flags #90228
-
-	local OABI=${ABI}
-	for ABI in $(get_install_abis) ; do
-		mkdir "${WORKDIR}/build-${ABI}"
-		cd "${WORKDIR}/build-${ABI}"
-
-		multilib_toolchain_setup ${ABI}
-
-		einfo "Configuring sandbox for ABI=${ABI}..."
-		ECONF_SOURCE="../${P}/" \
-		econf ${myconf} || die
-		einfo "Building sandbox for ABI=${ABI}..."
-		emake || die
-	done
-	ABI=${OABI}
-}
-
-src_test() {
-	local OABI=${ABI}
-	for ABI in $(get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Checking sandbox for ABI=${ABI}..."
-		emake check || die "make check failed for ${ABI}"
-	done
-	ABI=${OABI}
-}
-
-src_install() {
-	local OABI=${ABI}
-	for ABI in $(get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Installing sandbox for ABI=${ABI}..."
-		emake DESTDIR="${D}" install || die "make install failed for ${ABI}"
-	done
-	ABI=${OABI}
-
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${D}"/var/log/sandbox
-	chmod 0770 "${D}"/var/log/sandbox
-
-	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-	if [[ -n ${old} ]] ; then
-		elog "Removing old sandbox libraries for you:"
-		elog ${old//${ROOT}}
-		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
-	fi
-}
-
-pkg_postinst() {
-	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
-}
diff --git a/sys-apps/sandbox/sandbox-2.10-r1.ebuild b/sys-apps/sandbox/sandbox-2.10-r1.ebuild
index 0784e5d21be3..2270f920e3f1 100644
--- a/sys-apps/sandbox/sandbox-2.10-r1.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r1.ebuild
@@ -7,7 +7,7 @@
 # period.
 #
 
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing pax-utils
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
@@ -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
@@ -56,6 +56,9 @@ sb_configure() {
 
 	use multilib && multilib_toolchain_setup ${ABI}
 
+	local myconf=()
+	host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092
+
 	einfo "Configuring sandbox for ABI=${ABI}..."
 	ECONF_SOURCE="${S}" \
 	econf ${myconf} || die
diff --git a/sys-apps/sandbox/sandbox-2.3-r1.ebuild b/sys-apps/sandbox/sandbox-2.3-r1.ebuild
deleted file mode 100644
index 30c85dbc4044..000000000000
--- a/sys-apps/sandbox/sandbox-2.3-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd"
-IUSE="multilib"
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-EMULTILIB_PKG="true"
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES=-sandbox emerge sandbox"
-}
-
-sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
-
-src_compile() {
-	filter-lfs-flags #90228
-
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		mkdir "${WORKDIR}/build-${ABI}"
-		cd "${WORKDIR}/build-${ABI}"
-
-		use multilib && multilib_toolchain_setup ${ABI}
-
-		einfo "Configuring sandbox for ABI=${ABI}..."
-		ECONF_SOURCE="../${P}/" \
-		econf ${myconf} || die
-		einfo "Building sandbox for ABI=${ABI}..."
-		emake || die
-	done
-	ABI=${OABI}
-}
-
-src_test() {
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Checking sandbox for ABI=${ABI}..."
-		emake check || die "make check failed for ${ABI}"
-	done
-	ABI=${OABI}
-}
-
-src_install() {
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Installing sandbox for ABI=${ABI}..."
-		emake DESTDIR="${D}" install || die "make install failed for ${ABI}"
-		insinto /etc/sandbox.d #333131
-		doins etc/sandbox.d/00default || die
-	done
-	ABI=${OABI}
-
-	doenvd "${FILESDIR}"/09sandbox
-
-	# fix 00default install #333131
-	rm "${D}"/etc/sandbox.d/*.in || die
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${D}"/var/log/sandbox
-	chmod 0770 "${D}"/var/log/sandbox
-
-	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-	if [[ -n ${old} ]] ; then
-		elog "Removing old sandbox libraries for you:"
-		elog ${old//${ROOT}}
-		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
-	fi
-}
-
-pkg_postinst() {
-	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
-}
diff --git a/sys-apps/sandbox/sandbox-2.4.ebuild b/sys-apps/sandbox/sandbox-2.4.ebuild
deleted file mode 100644
index bb5a59207dc6..000000000000
--- a/sys-apps/sandbox/sandbox-2.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd"
-IUSE="multilib"
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-EMULTILIB_PKG="true"
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES=-sandbox emerge sandbox"
-}
-
-sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
-
-src_compile() {
-	filter-lfs-flags #90228
-
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		mkdir "${WORKDIR}/build-${ABI}"
-		cd "${WORKDIR}/build-${ABI}"
-
-		use multilib && multilib_toolchain_setup ${ABI}
-
-		einfo "Configuring sandbox for ABI=${ABI}..."
-		ECONF_SOURCE="../${P}/" \
-		econf ${myconf} || die
-		einfo "Building sandbox for ABI=${ABI}..."
-		emake || die
-	done
-	ABI=${OABI}
-}
-
-src_test() {
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Checking sandbox for ABI=${ABI}..."
-		emake check || die "make check failed for ${ABI}"
-	done
-	ABI=${OABI}
-}
-
-src_install() {
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Installing sandbox for ABI=${ABI}..."
-		emake DESTDIR="${D}" install || die "make install failed for ${ABI}"
-		insinto /etc/sandbox.d #333131
-		doins etc/sandbox.d/00default || die
-	done
-	ABI=${OABI}
-
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${D}"/var/log/sandbox
-	chmod 0770 "${D}"/var/log/sandbox
-
-	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-	if [[ -n ${old} ]] ; then
-		elog "Removing old sandbox libraries for you:"
-		elog ${old//${ROOT}}
-		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
-	fi
-}
-
-pkg_postinst() {
-	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
-}
diff --git a/sys-apps/sandbox/sandbox-2.5.ebuild b/sys-apps/sandbox/sandbox-2.5.ebuild
deleted file mode 100644
index 9047ea0469c2..000000000000
--- a/sys-apps/sandbox/sandbox-2.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd"
-IUSE="multilib"
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-EMULTILIB_PKG="true"
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES=-sandbox emerge sandbox"
-}
-
-sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
-
-sb_foreach_abi() {
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Running $1 for ABI=${ABI}..."
-		"$@"
-	done
-	ABI=${OABI}
-}
-
-sb_configure() {
-	mkdir "${WORKDIR}/build-${ABI}"
-	cd "${WORKDIR}/build-${ABI}"
-
-	use multilib && multilib_toolchain_setup ${ABI}
-
-	einfo "Configuring sandbox for ABI=${ABI}..."
-	ECONF_SOURCE="../${P}/" \
-	econf ${myconf} || die
-}
-
-sb_compile() {
-	emake || die
-}
-
-src_compile() {
-	filter-lfs-flags #90228
-
-	# Run configures in parallel!
-	multijob_init
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		multijob_child_init sb_configure
-	done
-	ABI=${OABI}
-	multijob_finish
-
-	sb_foreach_abi sb_compile
-}
-
-sb_test() {
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
-}
-
-src_test() {
-	sb_foreach_abi sb_test
-}
-
-sb_install() {
-	emake DESTDIR="${D}" install || die
-	insinto /etc/sandbox.d #333131
-	doins etc/sandbox.d/00default || die
-}
-
-src_install() {
-	sb_foreach_abi sb_install
-
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${D}"/var/log/sandbox
-	chmod 0770 "${D}"/var/log/sandbox
-
-	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-	if [[ -n ${old} ]] ; then
-		elog "Removing old sandbox libraries for you:"
-		elog ${old//${ROOT}}
-		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
-	fi
-}
-
-pkg_postinst() {
-	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
-}
diff --git a/sys-block/lsiutil/Manifest b/sys-block/lsiutil/Manifest
index e1d8aab16e8e..8dcd9484ddec 100644
--- a/sys-block/lsiutil/Manifest
+++ b/sys-block/lsiutil/Manifest
@@ -1 +1,2 @@
+DIST LSIUtil_1-62.zip 2344606 SHA256 b2c73c305edae484058b99a631edb06c81ae3b5f7a386ae0d6dd6cf1869dd623 SHA512 85de9ce20efe881e4f05fb4025031ce8c5f0b506912e813975c2e10600fa87f9c6f0147d274349f47c618ef996b7b5331b0328630ec2d153a3afe69557ba63f2 WHIRLPOOL 7d3b7f1eb7f033e417e031d2b75776923bfd99d7e4e854345e82a7846a108cfa751210807843bef95894763bfdb69b37088118751a3517b6f0f1bbd713ddf82d
 DIST LSIUtil_1.62.zip 2544375 SHA256 f4b0aa56b30cd6bad0834097f5297bafaa72ed540b5e103cd5cec153b49eda68 SHA512 65f68cf584b109e557ccc021412a922f867149c82060289e126186ff168b183ba325dcf3421f8275a4b34585a90ff3ef2848d1e8bfb7b386816d2ae7f5e9dd08 WHIRLPOOL f8b48521b60f75df73b406852213ac3cb4757c236764037bfe3cdc4b1dfb2085fab488fea864f251f1944ff3ac9ee97b160e90fc6177666a19c85e7f82f3548b
diff --git a/sys-block/lsiutil/lsiutil-1.62-r2.ebuild b/sys-block/lsiutil/lsiutil-1.62-r2.ebuild
new file mode 100644
index 000000000000..210998dff6b2
--- /dev/null
+++ b/sys-block/lsiutil/lsiutil-1.62-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="LSI Logic Fusion MPT Command Line Interface management tool"
+HOMEPAGE="http://www.avagotech.com/"
+SRC_URI="http://docs.avagotech.com/docs-and-downloads/legacy-host-bus-adapters/legacy-host-bus-adapters-common-files/LSIUtil_${PV/./-}.zip"
+
+LICENSE="LSI"
+SLOT="0"
+# This package can never enter stable, it can't be mirrored and upstream
+# can remove the distfiles from their mirror anytime.
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+RESTRICT="mirror bindist"
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+QA_PRESTRIPPED="/opt/bin/lsiutil"
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /opt/bin
+
+	if use x86; then
+		doexe Linux/lsiutil || die
+	elif use amd64; then
+		newexe Linux/lsiutil.x86_64 lsiutil || die
+	elif use ia64; then
+		newexe Linux/lsiutil.ia64 lsiutil || die
+	fi
+
+	dodoc changes.txt
+}
diff --git a/sys-block/lsiutil/metadata.xml b/sys-block/lsiutil/metadata.xml
index 91f4e72fb544..59a6b79f8dd5 100644
--- a/sys-block/lsiutil/metadata.xml
+++ b/sys-block/lsiutil/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>robbat2@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild
index f79b3b2961d5..896e302456a1 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ia64 ~x86"
+KEYWORDS="-* ~amd64 ia64 ~x86"
 IUSE=""
 
 DEPEND="sys-apps/pciutils"
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
index 4e29efc53e0f..741b506373d1 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
@@ -12,7 +12,9 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ia64 x86"
+# IA64 build is broken in setjmp code:
+# https://sourceforge.net/p/gnu-efi/bugs/9/
+KEYWORDS="-* amd64 ~arm ~arm64 -ia64 x86"
 IUSE="abi_x86_32 abi_x86_64"
 
 DEPEND="sys-apps/pciutils"
diff --git a/sys-devel/clang/clang-3.7.1-r100.ebuild b/sys-devel/clang/clang-3.7.1-r100.ebuild
index 8f3633d6b6da..1ba7a7085955 100644
--- a/sys-devel/clang/clang-3.7.1-r100.ebuild
+++ b/sys-devel/clang/clang-3.7.1-r100.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 @@ SLOT="0/3.7"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug multitarget python +static-analyzer"
 
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
 
 # Please keep this package around since it's quite likely that we'll
 # return to separate LLVM & clang ebuilds when the cmake build system
diff --git a/sys-devel/clang/clang-9999-r100.ebuild b/sys-devel/clang/clang-9999-r100.ebuild
index f253e0b845c0..eb10ee5738d3 100644
--- a/sys-devel/clang/clang-9999-r100.ebuild
+++ b/sys-devel/clang/clang-9999-r100.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$
 
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="debug multitarget python +static-analyzer"
 
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
 
 # Please keep this package around since it's quite likely that we'll
 # return to separate LLVM & clang ebuilds when the cmake build system
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 5ba85ad365a2..bdf27efd05b7 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,2 +1,3 @@
 DIST crossdev-20150602.tar.xz 22388 SHA256 7fef5b43f9ecbae0b9e1f7a993b53fc97b9bc1fa1d818aa46171c557c57aa23a SHA512 2cc9f2ba9bba037c909204b872b84e1087737f0804fe5f900a5d6e0b2948885aa17dc91d77ac3e38ce9752c56936fe5a92a77b6a264a029c98ef43e641bb7e8d WHIRLPOOL 5fd0e89c92c1ace214580bba200a5ff829a0547437949e0e4d39499305bd1ee75ddbe6ad32cbe1acc39392a8666d681b2c446bd10f257be788df5a7ed8a3a32d
 DIST crossdev-20150716.tar.xz 22152 SHA256 3988039ebc5363cba752a04ba00df18b0d8c1ac10be342880feda5f848a20a22 SHA512 8c41d9d5e6df8cc894e52b841f827b517a090edd0e281d181cc38d6ce472b75cb592eef487d1fdb99c31b6daf903d2636b625ebd5c8fa2fbbeadfb98e0e5cfbe WHIRLPOOL 39f3e941a2dcb5915f8e81725d8d8abaf3fd9dfa676d7c7096cb188b75c9af439c6e75b34207bd3404f9a1f15954999d8a42dfaf09646aa3c6a0925bf40fb963
+DIST crossdev-20151026.tar.xz 22160 SHA256 ad5ff1cc334325f83f60f87f9a6d795c606317665042cece9d8f12297312ca28 SHA512 f60efd4ad867efd0eb33de5fe327ccbfe73b574c97507bc0edd7ef141ad74c035ae2a0d446180e6a9eb5f43197f44933a452245feec849bacfb03fc07067edd0 WHIRLPOOL 7a8f556e53e7142ccf9c56d6daf700b33d66e530d85e5a5ed5b154a52bbba450956381af06f7b5748a6a82a43666a8c1b7d879296869dadd090e8887fc623ea9
diff --git a/sys-devel/crossdev/crossdev-20150716.ebuild b/sys-devel/crossdev/crossdev-20150716.ebuild
index 3b816c239cff..ed20e4c7f32c 100644
--- a/sys-devel/crossdev/crossdev-20150716.ebuild
+++ b/sys-devel/crossdev/crossdev-20150716.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then
 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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20151026.ebuild b/sys-devel/crossdev/crossdev-20151026.ebuild
new file mode 100644
index 000000000000..3b816c239cff
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20151026.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+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-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild
index 1daeee5a541a..8d723827582d 100644
--- a/sys-devel/gdb/gdb-7.10.1.ebuild
+++ b/sys-devel/gdb/gdb-7.10.1.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.x
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
 REQUIRED_USE="
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 582064971ca6..16c4d32ceacb 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -101,18 +101,6 @@ pkg_pretend() {
 
 	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() {
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 1cbebfc5c67e..a99130f0cc51 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,6 +12,7 @@ DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe14
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-lib-EN-1517-libc.patch 24159 SHA256 d9662fc730a3cd8f45763cb23ffb8500606123b91947fe3aaad250b36791bf91 SHA512 bc08438974eafe038298f9b1c01b02b85503ac909af7aa9d852929bac3620afc24d0339cbe5b2368c05879619d3ba4fb377cd2a805c261e2f4eec3ef5bdd6da6 WHIRLPOOL 0cb41d381856e6a25ae9505f68d392646e0f47cbb8b5d395fc88da36115fa876fff55cde85c62cedbd48427dc4944b5343f49a3beb5e7a9ded544ff2c89e9363
+DIST freebsd-lib-EN-1603-yplib.patch 2358 SHA256 f4151d7188cf5a925d120008a03dd9f1088fcec20bdc46cc91b3a3bebaa712c5 SHA512 0cde2e0edbdd080a44ff90806d4a349fbffa3fae9737e10d2b22b89aaf07da95202aa520e2fcd042126ca6ebdf8504de550835d022c3d53cf16a4c4cdee35b9c WHIRLPOOL 7d1706c31ea976272761ca749aeef886c6f76163dcd6f5988b6e449125b745d25a0f85bead8ec75a93784a25caf237a15a79de0b444a2dd2ddcf73308f89c64f
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index 7168bea50df7..e5d7309f5c0e 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -10,7 +10,8 @@ DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:17/libc.patch" )
+UPSTREAM_PATCHES=( "EN-15:17/libc.patch"
+	"EN-16:03/yplib.patch" )
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index a79317e983d9..fac150cdee51 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,6 +1,12 @@
 DIST freebsd-sources-9.1-en-13-03.patch 32571 SHA256 8bafbaba1b23f4651a9e578dbbb3b8d9b4a0a28dc1702f6dc17a40728b861595 SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc WHIRLPOOL c7b0a56efd9cebecde56590cacb1ee743845ce13577505255deca44c167d679ce94c759cfb363c26a5f2a9fc16dfc06d17eea18d638fd72c21ec0fdd81a71c5f
 DIST freebsd-sources-EN-1519-kqueue.patch 543 SHA256 09f3b3e80a9902bfea78dfcaf434daf09f7ffa4ff701a34eaf387fee36d1f4e3 SHA512 222c7256c79beefa322a20f4f35fde7ababb46b28669df491087d46f28d9dbf1eca09c9fbbef678f1262a52741eafc0701676d087025e968d34352b95b5a61f6 WHIRLPOOL c3a334188155f261036a81377940bbaa78ddfcee1727001fb71759af67300c8a3ab02a649bec239522d0a06f143064a168ea925285c6a9d7f07a05ed81999d10
 DIST freebsd-sources-EN-1520-vm.patch 1100 SHA256 cc6c4e383d53316aba079ef8047aa80e8256214877d4281049df923d6aea7098 SHA512 2a853d0a3c57832915922ab511175395b0f2d43346e3b2501e83e42f063ac32bf3317bc93f2e3151d630f34e7b0fbcd3b21092fffcf163ba1b39c156f6b3c8ce WHIRLPOOL 7999092d2c5ddffc5e9ef665536150f768de7936c38306616d7a1ee63339afae17b04ae2aa9a2b110ed219c1039beeff5dbff8e222e1ea6a921c16c4f262e587
+DIST freebsd-sources-EN-1601-filemon.patch 15491 SHA256 8237b34ca75e6991f7de33c222ef64adc2a3d9e5035d05df96ad6cd85e00967a SHA512 28926bf7f23428d3361bf97b8b0a073df0a49488cd788b28f1671d0786c7f0185c0e3e7216ac5f19be2cfd9867bbbe4a3f81b811fce0394cbaae0c301b164c02 WHIRLPOOL 825c8872d9a312cba2d9ccdeb7ff50eb330f7c13aba168a09ffde0691969412f51bf2175e72acb5210ed38fad392f4db60973049f702de1a852e5f7ade90734e
+DIST freebsd-sources-EN-1602-pf-10.2.patch 12239 SHA256 ad2bc821210a9dbca355b21c9c4577344158f3d67e9871788d9295c35e357e97 SHA512 b7aa136b9ece36525bdfe4d63711f073e070d552136663715ca98b9c3dfb58146d61d74cd9032c4f7a239c421992d19ad609a75ad106038e21c8fc6e4e77d08a WHIRLPOOL 085fdbdef54a96ad0a7a90217ff5027a69452c87d12d77e857066bfb7de4ac910371c827d10b5202331afc04c9ebc97773f91dee11f1a89b55fadc618ffea7d9
+DIST freebsd-sources-SA-1601-sctp.patch 608 SHA256 19eb23dd143c6e5b0e3ee44d523dcb340d9b36d29bcb9bb21d27a248c1b093d0 SHA512 4671377b5c9034c28d2aa3176f872dab38dbec06d5d944d99164b2e449e996bc361f7910f70046290439636c3a8a7139da382c79123518d6cfbc5aead47f9ab6 WHIRLPOOL 2e5303d45f8e6aea0accbef603ec4c9bbd1b0bb0fcf78f797f353cacbe10f5e90c0217ff7c3d1396ed59d0b08f6c60bb5b7fa70f9641cda3fc2fd64dcb5b3423
+DIST freebsd-sources-SA-1603-linux.patch 2815 SHA256 81e9590e56f091f6e67f2f6826c552f67172d5d3067defda3569377c61cb43d3 SHA512 9773a4b12c352d96a22279bdf428bef40650e38f8daec85beb8d321524ff0e45c4f31b40c897a3928261b0c9131dbfa80cb8c80ed2aa41eb4846588fc0980a63 WHIRLPOOL 15f8a62df9d5517f3f66635740069b791b676a2cdbaa696a63cf939df8926521acd891005f866a5607f235c52c737d1acdec36d72d61cc74c47c0cd075ae1180
+DIST freebsd-sources-SA-1604-linux.patch 1164 SHA256 0c1f169904600d13a5efe2bef6999f3da433a615642a80cb2ec960f164ff6208 SHA512 ccc15464071032b5bb4a5bed46a28cb036699b281b543ce5cdfb37f2cb728c66d9194080e1e010169145591ae3f4770ae84daf3149d9498c6302c0870ae2da10 WHIRLPOOL b58344e4b2b1e53e33674039882572d7f0b8987202371ff631e91f345698368d70e6af7ad43010f1d6cb7f0161b3d59587abdffd621300db461701832953dabb
+DIST freebsd-sources-SA-1605-tcp.patch 972 SHA256 171e3029d5ae440da75b4ab5fdc986d9e72ecc11cfdeae490ce401b53997c503 SHA512 e0c973b62e925f442039b1baa45b89694f2c7a25d3ee61f1238d4bea3771273945bd56694eb2f84770dabf25a252950db24ca421687c065ef84624067c37eed1 WHIRLPOOL 0d4b4025f57f956017caff98730d89f54a737e4cfd6d4588eec86d761aaf47b4242ca1a8c81245c70b9f492f36a1c771bbde5bac98061c76e556d239d25a33d8
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r2.ebuild
index b1f9daa8f5b6..2e3b1adb8d0f 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r2.ebuild
@@ -12,8 +12,14 @@ SLOT="0"
 IUSE="+build-kernel debug dtrace zfs"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:19/kqueue.patch"
-	"EN-15:20/vm.patch" )
+UPSTREAM_PATCHES=( "SA-16:01/sctp.patch"
+	"SA-16:03/linux.patch"
+	"SA-16:04/linux.patch"
+	"SA-16:05/tcp.patch"
+	"EN-15:19/kqueue.patch"
+	"EN-15:20/vm.patch"
+	"EN-16:01/filemon.patch"
+	"EN-16:02/pf-10.2.patch" )
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index 2f6f6893e943..dc300dc65398 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -12,3 +12,5 @@ DIST aufs4-standalone-0_pre20151102.tar.xz 677588 SHA256 5e0aa085e42dacc45991e49
 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
diff --git a/sys-fs/aufs4/aufs4-0_pre20160111.ebuild b/sys-fs/aufs4/aufs4-0_pre20160111.ebuild
new file mode 100644
index 000000000000..08283b50ae37
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20160111.ebuild
@@ -0,0 +1,164 @@
+# 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
new file mode 100644
index 000000000000..08283b50ae37
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20160118.ebuild
@@ -0,0 +1,164 @@
+# 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/fuse/Manifest b/sys-fs/fuse/Manifest
index c4459b97fdc9..73fdeb9cf1e0 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,2 +1,2 @@
-DIST fuse-2.9.3.tar.gz 572044 SHA256 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c SHA512 03f43f88694ec7e039ff3579a8e76349b5a5a05872c55901fc1d9ee53dbb6b1e69f6dd0005b620f3b5ead0b14da8eeb31d46b922d10f88f4e3f830aa47e8162c WHIRLPOOL 739562e48e85326049dac0ef06653e5e6574a01dd60649e23ddc0990ea6c1979e6ce952a1e84d0776b706fbcad79eb0e1328aa35f70ba4881db9a4482d254a04
 DIST fuse-2.9.4.tar.gz 577282 SHA256 6be9c0bff6af8c677414935f31699ea5a7f8f5f791cfa5205be02ea186b97ce1 SHA512 055ec2a78793276102bc5a0afea9eebd18b151cf752d0985380ffbde1c554e9fb7bc3a43838618e3957b274aa06624303ea12f32c659365c4768dad887bb557d WHIRLPOOL 6c866ba05be5a56e1b1d8793378c0c5c683375e9baad6de22344adaf5bb35021182b15783f59911259f98cb914ef4a1cb70be0cb9b5cd6625173b3b6454c32d7
+DIST fuse-2.9.5.tar.gz 565245 SHA256 579f371cc5ffc1afca7057512bf7d52988a9ede57859a7c55e5b9f72435cdbb5 SHA512 65a7355a2e6b872ab055181222e8fb5918c3ea7b93eee3350a812a1545b2c2bee1bfc163ce1e57776d1721151223c437cfb92c4b286e075e68d0eed742447413 WHIRLPOOL 7b6b69b2b58e200e7c1957c2bbe4b57da1a400cbc695114c89566dc57b523fd513698e3d9b0e7125521f9e53b5e17c0397601bdaebe8bafc1790c363fa2f55bb
diff --git a/sys-fs/fuse/fuse-2.9.4.ebuild b/sys-fs/fuse/fuse-2.9.4.ebuild
index 1c493a96384d..fea8c87920e2 100644
--- a/sys-fs/fuse/fuse-2.9.4.ebuild
+++ b/sys-fs/fuse/fuse-2.9.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/fuse/fuse-2.9.3.ebuild b/sys-fs/fuse/fuse-2.9.5.ebuild
index 79a7b7daecb4..c409bc31809d 100644
--- a/sys-fs/fuse/fuse-2.9.3.ebuild
+++ b/sys-fs/fuse/fuse-2.9.5.ebuild
@@ -1,25 +1,22 @@
-# 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 eutils libtool linux-info udev toolchain-funcs
 
-MY_P=${P/_/-}
 DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${PN}_${PV//./_}/fuse-2.9.5.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
 DEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
 	if use kernel_linux ; then
 		if kernel_is lt 2 6 9 ; then
@@ -32,7 +29,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-kernel-types.patch
+	epatch "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch
 	# sandbox violation with mtab writability wrt #438250
 	# don't sed configure.in without eautoreconf because of maintainer mode
 	sed -i 's:umount --fake:true --fake:' configure || die
@@ -51,9 +48,8 @@ src_configure() {
 src_install() {
 	default
 
-	dodoc AUTHORS ChangeLog Filesystems README \
-		README.NFS NEWS doc/how-fuse-works \
-		doc/kernel.txt FAQ
+	dodoc AUTHORS ChangeLog README.md \
+		README.NFS NEWS doc/how-fuse-works doc/kernel.txt
 
 	if use examples ; then
 		docinto examples
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
index be948520b186..1d274435d915 100644
--- a/sys-fs/fuse/metadata.xml
+++ b/sys-fs/fuse/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>kernel-misc</herd>
+  <maintainer>
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
-    <remote-id type="sourceforge">fuse</remote-id>
+    <remote-id type="github">libfuse/libfuse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sys-fs/jfsutils/metadata.xml b/sys-fs/jfsutils/metadata.xml
index 2d05364ed290..675283999555 100644
--- a/sys-fs/jfsutils/metadata.xml
+++ b/sys-fs/jfsutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel-misc</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<longdescription>
 		Utilities for working with IBM's journaled file system
 	</longdescription>
diff --git a/sys-fs/sshfs-fuse/Manifest b/sys-fs/sshfs-fuse/Manifest
index eefdb8893e25..8cef2df8e5aa 100644
--- a/sys-fs/sshfs-fuse/Manifest
+++ b/sys-fs/sshfs-fuse/Manifest
@@ -1,2 +1 @@
-DIST sshfs-fuse-2.4.tar.gz 132930 SHA256 3c93ba8522568093c94ff9c5a3763929380dd229365d905769ff82475d774dd1 SHA512 2f73d2163052f815bba65ad4a33a12626cd76628cd90df80378f3d045c61df7b0b4e7e5eec744e2adf44bdd1814cfc454d705eb74914ad4586f8835a926073de WHIRLPOOL 9773ca67c384dabc8122eaf08a27cb63f2cbdfb558d5cf2c581db2e8355801f93370763963d1f301a3504ef4bea80add1f6dadc6846c73847c5c056b4c0e394b
 DIST sshfs-fuse-2.5.tar.gz 136378 SHA256 e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e SHA512 48ae4008d10fe66b843ff1e891627f8262e00d064fec048c8c1189507e757994e81e4fa2deb4d8d56cff0d1818efe4a692494b9c48a01c6c79c626acefa1b53e WHIRLPOOL 00086691d287a770ce04ed068250841fe9fd8ec054a9f86f2ffd388c5c519b4f6bc559990724d25895065d6ab8618eb07129801c32a68eb9bfefb8fa952a412f
diff --git a/sys-fs/sshfs-fuse/metadata.xml b/sys-fs/sshfs-fuse/metadata.xml
index e93f1bcba449..d91bea8bceb7 100644
--- a/sys-fs/sshfs-fuse/metadata.xml
+++ b/sys-fs/sshfs-fuse/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>kernel-misc</herd>
+  <maintainer>
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
   <upstream>
-    <remote-id type="sourceforge">fuse</remote-id>
+    <remote-id type="github">libfuse/sshfs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild b/sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild
deleted file mode 100644
index 0ff654b5af62..000000000000
--- a/sys-fs/sshfs-fuse/sshfs-fuse-2.4.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="Fuse-filesystem utilizing the sftp service"
-SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
-HOMEPAGE="http://fuse.sourceforge.net/sshfs.html"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=sys-fs/fuse-2.6.0_pre3
-	>=dev-libs/glib-2.4.2"
-RDEPEND="${CDEPEND}
-	>=net-misc/openssh-4.3"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README NEWS ChangeLog AUTHORS FAQ.txt )
-
-src_configure() {
-	# hack not needed with >=net-misc/openssh-4.3
-	econf --disable-sshnodelay
-}
diff --git a/sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild b/sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild
index 0ff654b5af62..917ae71458af 100644
--- a/sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild
+++ b/sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="4"
 
 DESCRIPTION="Fuse-filesystem utilizing the sftp service"
-SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
-HOMEPAGE="http://fuse.sourceforge.net/sshfs.html"
+HOMEPAGE="https://github.com/libfuse/sshfs"
+SRC_URI="https://github.com/libfuse/sshfs/releases/download/sshfs-${PV//./_}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 SLOT="0"
-IUSE=""
 
 CDEPEND=">=sys-fs/fuse-2.6.0_pre3
 	>=dev-libs/glib-2.4.2"
diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
index 935ff6455437..57f98a8f6e9f 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.6.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 multilib eutils
+inherit multilib eutils flag-o-matic
 
 DESCRIPTION="xfs dump/restore utilities"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
@@ -14,14 +14,17 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
-IUSE=""
+IUSE="nls"
 
 RDEPEND="sys-fs/e2fsprogs
 	>=sys-fs/xfsprogs-3.2.0
 	sys-apps/dmapi
 	>=sys-apps/attr-2.4.19"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	nls? (
+		sys-devel/gettext
+		elibc_uclibc? ( dev-libs/libintl )
+	)"
 
 src_prepare() {
 	sed -i \
@@ -38,6 +41,7 @@ src_configure() {
 	export DEBUG=-DNDEBUG
 
 	econf \
+		$(use_enable nls gettext) \
 		--libdir="${EPREFIX}/$(get_libdir)" \
 		--libexecdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sbindir="${EPREFIX}/sbin"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index ce44897d6aaa..b3586719b9ab 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,7 +6,7 @@ DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f
 DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
 DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1
 DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634
-DIST zfs-0.6.5.3-patches-p1.tar.xz 83068 SHA256 765a66adf67d0a3ae6a699561b98a5158d464e3b6ed413a72bdbbe6e6252ba66 SHA512 371c436dde6ad8ede3c36163e52c5f4fd0e8348f28c803454ee2c3779f32c827ec6f4bfd6003a318152e43c9afd70fb7981c3c9e93dcea3e34db6756f4524c83 WHIRLPOOL 52f40cc72f374dad50c3c69ca7ff6bb7bde4b33ec07f4371e271be88e1bb905c18bc7fe15810036e12b8852fb7527cd8b9634f9724758fede67153673c2e76e9
+DIST zfs-0.6.5.3-patches-p2.tar.xz 85996 SHA256 0e38b1bd7e2eb96c74b3eaab49c14f1f65fa02dc42b62b6015200185bfc911c7 SHA512 0a8fb131cc9a5a239a7434593000259a581b20ee7c6fef87ec2ea78281b7887151e219ebe66603b9dafaa4fa22cbf8c55175e1f6b36af4502c147c478f0b3e38 WHIRLPOOL 726bf1c05605943a205e2e70099c6cf8c7ba8cc9bbf34d45a2d56cea87c1e23166700979e47c82dd91bd1778e297dd211a0e6f48e0eab2392471218bcb5853ce
 DIST zfs-0.6.5.3.tar.gz 2524218 SHA256 49e6f9760ea172cb756f7357e4bcb90ee0293028540a68d62ed087724276131f SHA512 325cb91b7ddbcd6aa0bb9fc41eb0099dbb047a4e32d096fd414799729ef68cbc9c2e15714092eff8044a681af4ab552bd9ac1949cc673c6c5c3de1a23d9895ec WHIRLPOOL 957c3a75bb11befd4b74583883f2f11f717deb6bda368939b342049e809aa191a9ee8d1e709eaddc2a831418c7fdb5e763f918ff56d45f03baf4569ef8a4a070
 DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24
 DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r3.ebuild
index 17cf509dcb9e..882c0a77feb5 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r3.ebuild
@@ -14,7 +14,7 @@ if [ ${PV} == "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p1.tar.xz"
+		https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p2.tar.xz"
 	S="${WORKDIR}/zfs-${PV}"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 fi
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 99349cd469dc..7690f9c6af14 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -7,6 +7,6 @@ DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd
 DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1
 DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634
 DIST zfs-0.6.5.3-patches-p0.tar.xz 63780 SHA256 cc6d2881304738619b9d00bc55fbd358119b35cbb345cae2ecf538051f1b7fe7 SHA512 4a531fd10d1d4d9c9cabaad9c13d8112eab3641249a7ce44599288bc4510b444d132833fae2fdf922eff43670ce77d32972c7b5b4a7d70f80c3365a0dcc89b70 WHIRLPOOL adc20e7917a518c790007499763210a4d27a164abe00a86f76d64f56f0fafc459f5d5c483019acacc136e41c57894e669fd58956b3f0ac0bcafeb1e02fec7988
-DIST zfs-0.6.5.3-patches-p1.tar.xz 83068 SHA256 765a66adf67d0a3ae6a699561b98a5158d464e3b6ed413a72bdbbe6e6252ba66 SHA512 371c436dde6ad8ede3c36163e52c5f4fd0e8348f28c803454ee2c3779f32c827ec6f4bfd6003a318152e43c9afd70fb7981c3c9e93dcea3e34db6756f4524c83 WHIRLPOOL 52f40cc72f374dad50c3c69ca7ff6bb7bde4b33ec07f4371e271be88e1bb905c18bc7fe15810036e12b8852fb7527cd8b9634f9724758fede67153673c2e76e9
+DIST zfs-0.6.5.3-patches-p2.tar.xz 85996 SHA256 0e38b1bd7e2eb96c74b3eaab49c14f1f65fa02dc42b62b6015200185bfc911c7 SHA512 0a8fb131cc9a5a239a7434593000259a581b20ee7c6fef87ec2ea78281b7887151e219ebe66603b9dafaa4fa22cbf8c55175e1f6b36af4502c147c478f0b3e38 WHIRLPOOL 726bf1c05605943a205e2e70099c6cf8c7ba8cc9bbf34d45a2d56cea87c1e23166700979e47c82dd91bd1778e297dd211a0e6f48e0eab2392471218bcb5853ce
 DIST zfs-0.6.5.3.tar.gz 2524218 SHA256 49e6f9760ea172cb756f7357e4bcb90ee0293028540a68d62ed087724276131f SHA512 325cb91b7ddbcd6aa0bb9fc41eb0099dbb047a4e32d096fd414799729ef68cbc9c2e15714092eff8044a681af4ab552bd9ac1949cc673c6c5c3de1a23d9895ec WHIRLPOOL 957c3a75bb11befd4b74583883f2f11f717deb6bda368939b342049e809aa191a9ee8d1e709eaddc2a831418c7fdb5e763f918ff56d45f03baf4569ef8a4a070
 DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19
diff --git a/sys-fs/zfs/zfs-0.6.5.3-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild
index 6963b74cdd02..119d71db0e6e 100644
--- a/sys-fs/zfs/zfs-0.6.5.3-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild
@@ -15,7 +15,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
 	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-p1.tar.xz"
+		https://dev.gentoo.org/~ryao/dist/${P}-patches-p2.tar.xz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 fi
 
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 1515f33aec3a..8852881d4222 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -7,6 +7,7 @@ DIST aufs-sources-4.2_p20151012.tar.xz 166928 SHA256 2f3b5c79bc28a9b609cd7def954
 DIST aufs-sources-4.2_p20151116.tar.xz 167812 SHA256 3bda3fe61fa32a886b2fd723c4c00764401e40edf8d1c9ad1ee9610ff036ce95 SHA512 80cfc69a11ed9b3b6aa109523edf94d2f3b358535f9f310cf845129ffd2d831ea3b7e5608afbc76f8a0ee28d8e0f27ea1c0417be2a93d1bb74069907ebc7c440 WHIRLPOOL 58511b0437df861bb30a892c802c25135617755f156ffa51e0312c598e04822d1646b629123778253e5234847fc4058c0d6073d9b3f9e2f7301dec99e62561a3
 DIST aufs-sources-4.3_p20151109.tar.xz 167420 SHA256 354c397edd4b58e7114f623871f758d1215011127a69de98041721035add1162 SHA512 2b38fcc3b02287cab3e92c7155cacec533ae4b6893f9efa1e951af0cedfabfbc39472259c9cd435184a7d372bac4ab46239261d6c0196d12bb7b2314f67c4758 WHIRLPOOL 69a670e9026ed04ad62041446a694be71098a4fd40f395a596cf3c4ac6f3d5cd96e354123b57facb5890d76cd8510a7d70036ff7a3fc681e4895f6b2e0b934aa
 DIST aufs-sources-4.3_p20151116.tar.xz 167772 SHA256 9c2784ceb8e7728e5a3facb319a10411e24ec1a45bdd364181e9340d6b51e8f0 SHA512 859715a0f9f1278a487b9ee4bedc44654aa0967a85280c98a1636e5ce3617d6ca81dd5c37130baa5d4f1c186d3b1fa69df1a719c8cfc9a2b38a238da6e5a70f2 WHIRLPOOL 9b4db70c6ac919fed7af474a3a0904889af2ff9b926ffed876cd3f60737a7885319b92aa7105ed5dce71ff58172e0227005bc1e2643784490550616d957b694f
+DIST aufs-sources-4.4_p20160118.tar.xz 168316 SHA256 9f28b43dc7ba8c70a61ecb1726debf087226e68c2381d10fce72161c7fd443bf SHA512 fbb0b4dc6fca6c3b8d8f43c610c2029bb117ed51f42dbd868fd8098c380480782517cae385618c46ec7a8f416298077b810285d57202a9fca157ca0dff846031 WHIRLPOOL 6f355b41e31e707f0674dcf957055e26a18769b7f576e48f79c40594c04a662655996a3911cc7128fd5fd07ab5f18ce0305b7e763a786b4cffb5f630bc0e5f80
 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
@@ -59,8 +60,12 @@ DIST genpatches-4.3-3.extras.tar.xz 16284 SHA256 575fdbd65e2c4a607cecd55e5ddb9be
 DIST genpatches-4.3-4.base.tar.xz 75572 SHA256 c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512 a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1 WHIRLPOOL 04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3
 DIST genpatches-4.3-4.experimental.tar.xz 61592 SHA256 93b8882ba8e67d58f997a9114d5f6d80097aa2773706299899dc38e14d23dda1 SHA512 ecd35bf49aff3afba08eadff0bef4adeac1d2de4e99f27f7fb2d21a55cbc933ea14eb540e77324680b551b9d96f613de7f5882f12efb25aac7109aa92a47713e WHIRLPOOL 259028c079acb258dbef7f36541ad1cce204b4db3058190b00a627e88d48247f4352e0dcd8d46f2106ba292ac740aea3e9d1220e4cb7865cfc6a03d402028370
 DIST genpatches-4.3-4.extras.tar.xz 16292 SHA256 51f02ec53d62389b330e5247a30cc1b84e689f450be6ee6a14f70aa563cac258 SHA512 f1861903f167a85bec8779cdd38d84e1503be4fa417582eb254627a421de32582e81e5983a7e38d371f74175b44685e34f6264cc7f3557b6e021140612afc644 WHIRLPOOL 610c81d7eb45f2152e90c6fdc88fe40a92701e9208bd04127bb54a2ab64ae51ff39f31ae0802efd9fa83b723e467008de2e0d1d93c440d4d3d44834efcd3034b
+DIST genpatches-4.4-1.base.tar.xz 3460 SHA256 d8c94ed4b71deb4c138ab3234d9ffed1303b133f7ae2bbd6891615f0af86f849 SHA512 1b9e565f9bb173da5c9d7a4d657abb6f6f0470f8ee0cf671d638f27c9f52005b33d4984793ad8f4424215b87ab18a6fa46b2119a2d5146ccda1e9eb420525f30 WHIRLPOOL dfd911a7dbacd37e9e6c3a81501b9cfbd03ce1338c9b597f0da1e3363abf752dccdab85ebb3a494333bcdaef1fc04f9ab2f2df6797b55ce6e5f1c733be2fc737
+DIST genpatches-4.4-1.experimental.tar.xz 4900 SHA256 1593bfb10d2efa52519d74b2727a4560e11ab5d6ddea2d0f0c0bc8ac59e941f6 SHA512 7523e6de6d4f58b5ebf7d46e6beee58efb96fe4711060bdb358781d95c928a16e63abc26007690df6f25addd8bb07d2034d6040e52938278a0ee8bf4aa8d3db2 WHIRLPOOL b4703ca1a8f4e79a30d1f9ef7e3457c3e6c591c2f6f626a009b609b6396764b6a03939b8fda7debf3c4e3e4f996fc6a9c6a63048f607ab96d6fbc55946f4c303
+DIST genpatches-4.4-1.extras.tar.xz 16292 SHA256 b96ca9230b7dd3e91d571bf82da1ba76050cd5925c7cb537be089d5794e3a1a9 SHA512 a4826a8a652d8155665a8f39c842c0d38757230ab475e0288ce75394b2e62b88dc601b1ddb2ac5169d256ce95a9acc5ceeadc084c774d919f3ddb9e166a59067 WHIRLPOOL a53e9c415af0a8030b507479a7e8a2ff669a7bb409fc960b19b2348e367ed1f841d6339066ff211f16586965fdcaea074b50649d94120ebebdb0ca675ec3329b
 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
 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/aufs-sources/aufs-sources-4.4.0.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.0.ebuild
new file mode 100644
index 000000000000..4ee7441d3594
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.0.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="1"
+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/metadata.xml b/sys-kernel/aufs-sources/metadata.xml
index d7e0f2053364..5c2a78a0957c 100644
--- a/sys-kernel/aufs-sources/metadata.xml
+++ b/sys-kernel/aufs-sources/metadata.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="deblob">
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="deblob">
 		Remove binary blobs from kernel sources to provide libre license 
 		compliance.
 	</flag>
-		<flag name="experimental">
+    <flag name="experimental">
 		Apply experimental patches; for more information, 
 		see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
 	</flag>
-		<flag name="module">
+    <flag name="module">
 		Patch kernel to allow aufs being build as a module.
 	</flag>
-		<flag name="vanilla">
+    <flag name="vanilla">
         Use vanilla kernel sources without applying genpatches. 
 		WARNING: This flag will drop all support from the Gentoo Kernel 
 		Security team
 	</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
-		<remote-id type="sourceforge">aufs</remote-id>
-	</upstream>
+    <flag name="kdbus">Apply the kdbus patch. This also requires the "experimental" use flag.</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
+    <remote-id type="sourceforge">aufs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 5e23782ab610..ada8ea8f2ca4 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -6,5 +6,6 @@ DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad3674
 DIST genpatches-4.3-4.base.tar.xz 75572 SHA256 c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512 a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1 WHIRLPOOL 04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3
 DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
 DIST hardened-patches-4.3.3-5.extras.tar.bz2 1649484 SHA256 2a62a5eb4b98f4fbeb43511a0573d58226277d3112401abec37355d85e01ae23 SHA512 09b7272af44fb1e29cba857f7c3305d97f8997881f228a2f2eb56dda909ae5402a69336c6fccdf3920f8788a7922f10b0977517f5918d44702e1a9b668c708c7 WHIRLPOOL efc152c7680b84b682f9f6857b8c6b2b66b6d505f76b311a8e3289a606f46d4944d90478ff93e3656f41c367fdbcd65dcf3043842354b26b669b462ce49f3471
+DIST hardened-patches-4.3.3-6.extras.tar.bz2 1663066 SHA256 48b3fdbb5ea5df2f309f3496e7d45f1fd108101009dfc4121e898fd58a9c1eda SHA512 48784e1e198687e16234df4745e59e2d3aff557cf5b9686f5c8f3462b7a9c7b11999da9929150cc4a43f605ccd69921719fe2b1c9596915eccbe40489f1ff3a6 WHIRLPOOL 742c9ff8f7b847c2b97a422f253285d27b84568f3b75a1e23db1ecce4806824a42f7865634c306d3044eedd5b1b64957774c31446031501f5f4209fbd41a56c9
 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
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r4.ebuild
index 0fa68078f967..d6bb6a1b8458 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r4.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r4.ebuild
@@ -25,7 +25,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=sys-devel/gcc-4.5"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r5.ebuild
new file mode 100644
index 000000000000..5b3ca752d12a
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r5.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="4"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6"
+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-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
index 1c2db779c33d..d04e69fdd73c 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/spl/spl-0.6.3-r1.ebuild b/sys-kernel/spl/spl-0.6.3-r1.ebuild
index 88baf8c10c65..dc2ebe6824ab 100644
--- a/sys-kernel/spl/spl-0.6.3-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.3-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$
 
@@ -46,7 +46,6 @@ pkg_setup() {
 		KALLSYMS
 		!PAX_KERNEXEC_PLUGIN_METHOD_OR
 		!PAX_SIZE_OVERFLOW
-		!PAX_RANDKSTACK
 		ZLIB_DEFLATE
 		ZLIB_INFLATE
 	"
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 51ba4a923997..c0a989cd150b 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -102,62 +102,82 @@ setup_target_flags() {
 			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
 			filter-flags "-fcall-used-g7"
 			append-flags "-fcall-used-g6"
-			filter-flags "-mvis"
-
-			GLIBCMAJOR=$(get_version_component_range 1 ${PV})
-			GLIBCMINOR=$(get_version_component_range 2 ${PV})
-
-			# set CTARGET_OPT so glibc can use cpu-specific .S files for better performance
-			# - UltraSPARC T1 (niagara) support requires >= glibc 2.8
-			# - UltraSPARC T2 (niagara2) support requires >= glibc 2.7
-
-			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
-				case ${ABI}:${CTARGET} in
-					sparc64:*|\
-					default:sparc64*)
-						filter-flags -Wa,-xarch -Wa,-A
-
-						if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then
-							CTARGET_OPT="sparc64v2-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9b"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
-						elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then
-							CTARGET_OPT="sparc64v-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9b"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
-						elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then
-							CTARGET_OPT="sparc64b-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9b"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
-						else
-							CTARGET_OPT="sparc64-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9a"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"
-						fi
+
+			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparc64v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
 					;;
-					*)
-						if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then
-							CTARGET_OPT="sparcv9v2-unknown-linux-gnu"
-						elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then
-							CTARGET_OPT="sparcv9v-unknown-linux-gnu"
-						elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then
-							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-						else
-							CTARGET_OPT="sparcv9-unknown-linux-gnu"
-						fi
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
 					;;
 				esac
-			else
-				if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then
-					CTARGET_OPT="sparcv9v2-unknown-linux-gnu"
-				elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then
-					CTARGET_OPT="sparcv9v-unknown-linux-gnu"
-				elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then
-					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-				elif { is_crosscompile && want_nptl; } || is-flagq "-mcpu=ultrasparc2" || is-flagq "-mcpu=ultrasparc"; then
-					CTARGET_OPT="sparcv9-unknown-linux-gnu"
-				fi
-			fi
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparcv9v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
 		;;
 	esac
 }
diff --git a/sys-libs/newlib/newlib-2.2.0.20150423.ebuild b/sys-libs/newlib/newlib-2.2.0.20150423.ebuild
index 710990d1c8c9..064993fbcd88 100644
--- a/sys-libs/newlib/newlib-2.2.0.20150423.ebuild
+++ b/sys-libs/newlib/newlib-2.2.0.20150423.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$
 
@@ -7,7 +7,7 @@ EAPI="4"
 inherit flag-o-matic toolchain-funcs eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://sourceware.org/git/newlib.git"
+	EGIT_REPO_URI="git://sourceware.org/git/newlib-cygwin.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
diff --git a/sys-libs/newlib/newlib-2.2.0.ebuild b/sys-libs/newlib/newlib-2.2.0.ebuild
index f009c8d68ea7..f8746386f35a 100644
--- a/sys-libs/newlib/newlib-2.2.0.ebuild
+++ b/sys-libs/newlib/newlib-2.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$
 
@@ -7,7 +7,7 @@ EAPI="4"
 inherit flag-o-matic toolchain-funcs eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://sourceware.org/git/newlib.git"
+	EGIT_REPO_URI="git://sourceware.org/git/newlib-cygwin.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
diff --git a/sys-libs/newlib/newlib-2.3.0.20160104.ebuild b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
index 8c40312c0ad2..5f23c0ffb2ce 100644
--- a/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
+++ b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
@@ -7,7 +7,7 @@ EAPI="4"
 inherit flag-o-matic toolchain-funcs eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://sourceware.org/git/newlib.git"
+	EGIT_REPO_URI="git://sourceware.org/git/newlib-cygwin.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild
index 710990d1c8c9..064993fbcd88 100644
--- a/sys-libs/newlib/newlib-9999.ebuild
+++ b/sys-libs/newlib/newlib-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$
 
@@ -7,7 +7,7 @@ EAPI="4"
 inherit flag-o-matic toolchain-funcs eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://sourceware.org/git/newlib.git"
+	EGIT_REPO_URI="git://sourceware.org/git/newlib-cygwin.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
diff --git a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild b/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
index 6c7fcbc5e3fb..19d517135c08 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/schedtool/metadata.xml b/sys-process/schedtool/metadata.xml
index c50bcbc70dc8..ed4140056005 100644
--- a/sys-process/schedtool/metadata.xml
+++ b/sys-process/schedtool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel-misc</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<longdescription>
 		schedtool can be used to query or alter a process' scheduling policy under linux
 	</longdescription>
diff --git a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild b/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
index 6a2503b6fdfa..0b2c0ad4c9be 100644
--- a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
+++ b/sys-process/schedtool/schedtool-1.3.0-r1.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=4
+EAPI=5
 
 inherit toolchain-funcs
 
diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
index 72ad49cca1ce..d1b9409d7696 100644
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.6.0-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$
 
@@ -6,7 +6,7 @@ EAPI="4"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.6"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="amd64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 # The keyword voodoo below is needed to work around confilcting masking types
 # and for having arch specific preferences.
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index a44965268ee1..4dd8ca40fe8e 100644
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.7"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 		=dev-java/icedtea-bin-7*
diff --git a/virtual/jre/jre-1.6.0-r1.ebuild b/virtual/jre/jre-1.6.0-r1.ebuild
index 2b962e83d1e5..faa56fb4424a 100644
--- a/virtual/jre/jre-1.6.0-r1.ebuild
+++ b/virtual/jre/jre-1.6.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$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="1.6"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="amd64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="|| (
 		=virtual/jdk-1.6.0*
diff --git a/virtual/jre/jre-1.7.0.ebuild b/virtual/jre/jre-1.7.0.ebuild
index 707c38df8ed2..fbb7ff7a7916 100644
--- a/virtual/jre/jre-1.7.0.ebuild
+++ b/virtual/jre/jre-1.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="1.7"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 		=virtual/jdk-1.7.0*
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
index 784fa2ceff88..7549272cfcec 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.26-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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild
index f207a4afbe20..aa80f16a34bf 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.26.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/www-apache/mod_jk/mod_jk-1.2.37.ebuild b/www-apache/mod_jk/mod_jk-1.2.37.ebuild
index 36184271f890..72521989ac04 100644
--- a/www-apache/mod_jk/mod_jk-1.2.37.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.37.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$
 
@@ -8,7 +8,7 @@ inherit apache-module java-pkg-2
 
 MY_P="tomcat-connectors-${PV}-src"
 
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
 HOMEPAGE="http://tomcat.apache.org/connectors-doc/"
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index 1846393dfa2f..07355e190db2 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,4 +1 @@
 DIST 3.8.1.tar.gz 7938754 SHA256 2eff94b5674ceb3cfc3a53c1addb297b016f74b1e732f17e9d05920f2ed2a35a SHA512 70151a2f28ab8998fea9be2817bd9ba7e80eea1aa78867d69f0e250bea7e9f025825566a0b80d06de09c6d73352f6951922cc52da98370c3c341edabffbc6061 WHIRLPOOL f67fc41cf4d25512d2b0834e9903f59e230aeeb0ab9e92394ebc9ae938cabed3de47fae00e1595d3a402f94b7e8d9ed00e5215977f81a972e9e3cd8acc994d82
-DIST ampache-3.4.3.tar.gz 1414765 SHA256 001b34abb77a830ce5f67d9823b8fbeba75a517b577c650349843854deb8d0eb SHA512 89d14ac458f40c15dcbe5a992636f573afed15f31cbcdfbce66415f9e0107fd53c978947ba8744ba01fc8d24bb1d3c3681c1bad280be2b759e5fd15d1f722441 WHIRLPOOL ee5f619f22ba6e75969868789e58936ab47b6d59c66d69e8ba92c5b04c3c250679a5c5d51c8a37b66b2ae59e1b1e91514cbd6bd2ce959b75de2f4d6fc388cc22
-DIST ampache-3.5.3.tar.gz 1962048 SHA256 b4c0d58754007c19dc959659cf43442d9f0cf3ebdbeb35b8e2845870bca0ca4c SHA512 148c1f238f63955fceb5b31132118eca54aae3a0cd51df85dded1814f952d454c456f69786d8eec15d02fdc44007e7072aba6a5d717d37cdb6af7f42f032a7bc WHIRLPOOL 0ee48c54134ab43a376b81d13be784aabf4a0f4c794d4591d083508cbee1250b86f8cf93c7dddf375eefcafeb12cb911655da0f5f241188a6f2a0ce58b8d8731
-DIST ampache-3.5.4.tar.gz 1961555 SHA256 f5ee6906d2af60ea8dcbd1b3a18119ffbe6b92c21c0b0c59a1ba01e5bead5f74 SHA512 0a671ce34329ab1b12b7a3880eea1f1986a5f599aae72e7294247accc4819a535bfd59685b93ab2cb9995404e394f4c8ed5424844113b6bf5b6d20404ae06482 WHIRLPOOL 2a5dc47dda725928bb2de0496c91ee659e4393691c31eb825e633e7600f62585f9412da9cb4b2b9becb83880d77a2c68de2312a7b4ef75fc998024507a680ee6
diff --git a/www-apps/ampache/ampache-3.4.3.ebuild b/www-apps/ampache/ampache-3.4.3.ebuild
deleted file mode 100644
index d108331ed3a4..000000000000
--- a/www-apps/ampache/ampache-3.4.3.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 webapp depend.php
-
-DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface"
-HOMEPAGE="http://www.ampache.org/"
-SRC_URI="http://www.ampache.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use pcre session unicode iconv xml mysql gd zlib
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc docs/*
-	rm -rf docs/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
-	webapp_src_install
-}
diff --git a/www-apps/ampache/ampache-3.5.3-r1.ebuild b/www-apps/ampache/ampache-3.5.3-r1.ebuild
deleted file mode 100644
index 3b818d75193e..000000000000
--- a/www-apps/ampache/ampache-3.5.3-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="2"
-
-inherit webapp
-
-DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface"
-HOMEPAGE="http://www.ampache.org/"
-SRC_URI="http://www.ampache.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/php[gd,hash,iconv,mysql,session,unicode,xml,zlib]
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-DEPEND=""
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc docs/*
-	rm -rf docs/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Install and upgrade instructions can be found here:"
-	elog "  /usr/share/doc/${P}/INSTALL.bz2"
-	elog "  /usr/share/doc/${P}/MIGRATION.bz2"
-	webapp_pkg_postinst
-}
diff --git a/www-apps/ampache/ampache-3.5.4.ebuild b/www-apps/ampache/ampache-3.5.4.ebuild
deleted file mode 100644
index 1040dd0bc445..000000000000
--- a/www-apps/ampache/ampache-3.5.4.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 webapp
-
-DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface"
-HOMEPAGE="http://www.ampache.org/"
-SRC_URI="http://www.ampache.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="aac flac mp3 ogg transcode"
-
-RDEPEND="dev-lang/php[gd,hash,iconv,mysql,session,unicode,xml,zlib]
-	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-	transcode? ( media-sound/lame
-		aac? ( || ( media-libs/faad2 media-sound/alac_decoder ) )
-		flac? ( media-libs/flac )
-		mp3? ( media-sound/mp3splt )
-		ogg? ( media-sound/mp3splt media-sound/vorbis-tools )
-	)"
-DEPEND=""
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc docs/*
-	rm -rf docs/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Install and upgrade instructions can be found here:"
-	elog "  /usr/share/doc/${P}/INSTALL.bz2"
-	elog "  /usr/share/doc/${P}/MIGRATION.bz2"
-	webapp_pkg_postinst
-}
diff --git a/www-apps/ampache/ampache-3.8.1.ebuild b/www-apps/ampache/ampache-3.8.1.ebuild
index f5c35adc487f..23b06866b3a5 100644
--- a/www-apps/ampache/ampache-3.8.1.ebuild
+++ b/www-apps/ampache/ampache-3.8.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ampache.org/"
 SRC_URI="https://github.com/ampache/ampache/archive/${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="aac flac mp3 ogg transcode"
 
 RDEPEND="dev-lang/php[gd,hash,iconv,mysql,pdo,session,unicode,xml,zlib]
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 30c25da59930..03d6bf44a7b2 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,3 +1,3 @@
 DIST drupal-6.37.tar.gz 1112775 SHA256 e3db44fdeefa9c4b3edf31816a8cfcaffe300986dbebdc22769ec739d3296d5d SHA512 4895221c7fb2913618490722629888a4862f28633a49ba5363a0393974941c68d07a3e255d6f380d7d97d0aa3251a76c03d5d0f0ab4c968af301a1207d8d35a0 WHIRLPOOL 8d7a0576fba31f2fcf9035755d3ef9a521461d9b3dfab57eb8871fe66038f4056b690a84513bf61a639b4c5f8126fa5180734542b0036f5d089afb0cb2abfecd
 DIST drupal-7.41.tar.gz 3257325 SHA256 49ea620d191e81ffce0e7a96b5e7d12da672b3401c7ce1aff93fc941681eb111 SHA512 57ee4fb1044d958a9f5698d2046fcd69427be6da30c57918735ced3fc7dbe1ffc4c69cac8362cd668ef0769d78b20461d78905f7e91212062e56351818dfbaf9 WHIRLPOOL 931f98f5e9de14f2c6ffb1bf75686bfea73d8c73606a3a1ab7b0a64e9cf06b9375900403e877a209be7f57663a8446a24ea317ccf9c771a9f143c675102465b0
-DIST drupal-8.0.1.tar.gz 11697695 SHA256 3eaa512c4ba9bc38304f87ba20de04e118b8bb98851e27db6c6ccd7ddbd43a58 SHA512 a976811226119165af799aba24bbabba11802a98f98e13b6f3ada6470d5e183238e468657ecbb6e379468b75dd9d6cdb427ed20a2450fa8f28aff9beac70136c WHIRLPOOL 54d0f574ae40567db3a7c9ea4540a668e310df8155dfcbe219d0177b3c0eaa587580cc509d843acc941189432509fcfd83680b11677e7bb613c01fa7e8e9e51e
+DIST drupal-8.0.2.tar.gz 11720487 SHA256 1a795cc3cd04b62c50820dcbae15b75741227f00b42ed701f8ef8e36bcd69e5e SHA512 cc6bc90c2eb769aa723ac914f93e78915ee70085a61ba53c9162b87728124a048287b6e072202ab56145501a81f8eb4a23e71d70ba1245a15c2093bdc6938cd5 WHIRLPOOL 46705c6d96ad002237aaa8a9b8626f052d8473a64537c427ad9c2d009e3765c7bd05277f9a2a55536625b1bf89c9640429e28037893974e63fd19eee690d8812
diff --git a/www-apps/drupal/drupal-8.0.1.ebuild b/www-apps/drupal/drupal-8.0.2.ebuild
index ca6797a03c37..ca6797a03c37 100644
--- a/www-apps/drupal/drupal-8.0.1.ebuild
+++ b/www-apps/drupal/drupal-8.0.2.ebuild
diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
index 577464675a45..0f5ee77cdcbb 100644
--- a/www-apps/gitit/Manifest
+++ b/www-apps/gitit/Manifest
@@ -3,3 +3,4 @@ DIST gitit-0.10.6.1.tar.gz 265716 SHA256 c0ceb611e3e61f37af9e1fd1330a493ffbd07c5
 DIST gitit-0.10.6.2.tar.gz 271290 SHA256 ea5b443479ee797e8d9c851818feb7fd90830a45e4bff2f740b4e256cd268f58 SHA512 4a7391b004bc8982e1400c4cbac68b89b089136dcd4d9cdeff4dd2c02f409697bc41f4bf1527f002c9957024d308a518d6e71a3fe8ef8cf9a22aec7010f2f7c5 WHIRLPOOL 961d72ddfe7f1548b972912c07b94d308dac79da0297ad77e7017eaa0cc78ca5290766b6063c2f775db6e37b02fb2ca56de528d10c01affea7ff5b5641899e6f
 DIST gitit-0.11.1.tar.gz 275587 SHA256 29bbb782e2066bf831ad1aff471208e928310fc9ab6bfb32a775cd7521f19d1b SHA512 f153e8f402ceed453a29fc8ba06587c13a9370ea351e20031e32b2797bd79ddfa5b77dd770244d8a682b8a283a80e8eca3270a2b3e411c1d5210d1449a946547 WHIRLPOOL 89a95d387f4d7f66ea0124acdaadb2c42f4d9c17b7f54d8eb2026737ac01c1cf02f9a6ce63ecf1f12f665638001641e91aecbf03c2e2add694acd8539c10679a
 DIST gitit-0.11.tar.gz 273093 SHA256 c94271744ec5fe846e1b3994fc0349f4a38120a8d60618bedc1909367acf63a0 SHA512 6a53ecc1d30058693e41a34d8fa6fa420d181d249c8ddda904f46b62d070e90f90af8bcc264a9d8d1cc0ef0b8112ec995e068f44ffb5c61ac241bf01b487a532 WHIRLPOOL 520f2f0a1fb9e2eaed6eb6530c47c0d3aef25c6bd5f3034401deffc0648ab3895eb7c70a9e828b0b51e9d13d883191083912cb68bb3cc231ccca4493bf31bd4a
+DIST gitit-0.12.0.1.tar.gz 273570 SHA256 552996f2624ed08cd21a73303d666292f08a1294416d2811f9d57293c9e89506 SHA512 494ea0afe9caa615a60325811f7ba9f125f9be5b646e03f66ed8c4bb84c6d3e793fbab0f0626ace3f4d52d1ad7eaa60438ab600b80a587a7616c72f03e142c5e WHIRLPOOL a543238ed642868050eb109ca122cad7680b06601dcadba37648dfd695f7853242b20a5764e653377611d153f7a0df32c8e27f539b7d57b0ea468afe57ec8c07
diff --git a/www-apps/gitit/gitit-0.12.0.1-r1.ebuild b/www-apps/gitit/gitit-0.12.0.1-r1.ebuild
new file mode 100644
index 000000000000..54804432fdc4
--- /dev/null
+++ b/www-apps/gitit/gitit-0.12.0.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.16:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.5:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'aeson >= 0.7 && < 0.10' 'aeson >= 0.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
index 6bda22fd827f..b6b0f6e5a6c7 100644
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.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=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index af7d52c8aa6d..7e7fe9926546 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,2 +1 @@
-DIST jekyll-sitemap-0.8.1.tar.gz 62835 SHA256 f3d0e31d5818f2ce7a39d27eb99229cec7c9e706229878ec248b6c284776802a SHA512 2c0f3ce740deaa66018e6bfd80a5d293feeb70128926d2b6626e837b2d6becf01151f4a13cbf264279b4bd8b2972019a9facdaf5ce4fc54d3dbec1a1c304439b WHIRLPOOL 001720e21a87c07139d5c0d7c029c1858ef5e8f97dc24bd9880f60cd8ca980ac85dd0e7a0f32a1a0aeb3a2d6e3fc36561c93fbb3eb79c5dd8807307ec3324e7c
 DIST jekyll-sitemap-0.9.0.tar.gz 62710 SHA256 db437f1794ca32c13ef235becc3fffa53bb922ab0fc108f7c511dd04b3ce1107 SHA512 2c55f2869050c0e0d279e3974554dbdb03c6db25c5fa2997c12cd0c6615707ff8d53ef05cffed57dc8eb2e261677d5f86ebc889083989b7a7723e7d92922c1ba WHIRLPOOL d2e54098853f722e9052607425d7db735ed9604fcd24833cba8d13bb169c67a88368372e5795eb6c8419b60e3d1fc192ba2c03401bee0195607f8c83bfe68c3e
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.8.1.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.8.1.ebuild
deleted file mode 100644
index 370a759298c6..000000000000
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.8.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Automatically generate a sitemap.xml for your Jekyll site"
-HOMEPAGE="https://github.com/jekyll/jekyll-sitemap"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.9.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.9.0.ebuild
index 370a759298c6..63aa52cf2269 100644
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.9.0.ebuild
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.9.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"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index cbb1f55f21c8..eea4c75cb247 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,2 +1 @@
-DIST jekyll-watch-1.2.1.tar.gz 13660 SHA256 7641a8f4eb5a281ae0ff6f5553882b40ad95bd663136bc802036a3f3110e97fd SHA512 69fabe7ef01f2bbcf81e0ba0ce4e62d6999ff1a1da1b8dc254e364dc61af2bf6989f1f1ac8da6b2da7991e1972813b7c509fb0cb23558f16536b8f68fa57f62c WHIRLPOOL 2c082ce9bd703e639170f6b4ee781c3ebe8dad8e59f1cb0fdc690fb4136b4432368a53095f7455728fed4e6b44b0ae1d467dd26cc0acf8a7713b582fc3703c25
 DIST jekyll-watch-1.3.0.tar.gz 13882 SHA256 a87b9e76e575ec394525b6b804bf8aa430eb51df2e309f34b0f2f46129b9c353 SHA512 91950cdeba568ef368ea5f91f3ec3208073786f12e7a8587e2560c92be9108d5d97d9ddc517eb681df3335bcdc0f8b85c9425fbe289b39912c3c4c6ef8d641e2 WHIRLPOOL a5e18c641921f561e42557cbd902100fac085d2fd320771581d507122fa6fa77bf60cf9e26a7444eac0387227c1e131ab611cee814178cd1748c2e74912a67d1
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.2.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.2.1.ebuild
deleted file mode 100644
index 0c71aa098cb7..000000000000
--- a/www-apps/jekyll-watch/jekyll-watch-1.2.1.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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
-HOMEPAGE="https://github.com/jekyll/jekyll-watch"
-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/listen-2.7"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-	# Fix tests until Rspec:3 is in tree
-	sed -i -e "/default_formatter/d" -e "/verify_partial_doubles/d" spec/spec_helper.rb || die
-}
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild
index 4ffd0bce342d..9b6a4fea8645 100644
--- a/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild
+++ b/www-apps/jekyll-watch/jekyll-watch-1.3.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"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -25,6 +25,4 @@ ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
 
 all_ruby_prepare() {
 	rm Rakefile || die
-	# Fix tests until Rspec:3 is in tree
-	sed -i -e "/default_formatter/d" -e "/verify_partial_doubles/d" spec/spec_helper.rb || die
 }
diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest
index cb718aa4fef9..9a985afb59c5 100644
--- a/www-apps/mirmon/Manifest
+++ b/www-apps/mirmon/Manifest
@@ -1 +1,2 @@
 DIST mirmon-1.38.tar.gz 33021 SHA256 5defb2c0890d3461a2b8dd8cc3efc4c63c0814c043cb227a69b4a457a38b0ce3 SHA512 a879f7ac979ad31d24a27940600c7a95e0f9db6cc8654fd36f830f9a9cfb9d3a7e86fcb27870da3889ad159028a6807203664038e985c12a5f59a6b19b473b08 WHIRLPOOL 69a061b459a4456dfcb5742f1bd17a81843ad97f90ecb3f0849f5dc78618aab55fae4d771b3d4552eb90f9f1b1ec0d70464e5f7e94565fa8097b7c39c3d4a9d2
+DIST mirmon-2.10.tar.gz 72212 SHA256 384d0bd14d71b87797d2a1fa66a0fcb9af11307a9de20f2c5544344b3710fa33 SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d WHIRLPOOL 1aef8dfbd9b045407a9f5ad12f95fd92e0482a95aa487ecb54de54a94d611320e295dc03b639988c81496292f7b668e132873480061b9a1758fff47e2542e06f
diff --git a/www-apps/mirmon/mirmon-2.10.ebuild b/www-apps/mirmon/mirmon-2.10.ebuild
new file mode 100644
index 000000000000..8d1a629c4d2e
--- /dev/null
+++ b/www-apps/mirmon/mirmon-2.10.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 webapp eutils
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="Simple webapp to monitor the status of mirrors"
+HOMEPAGE="https://www.staff.science.uu.nl/~penni101/mirmon/"
+SRC_URI="https://www.staff.science.uu.nl/~penni101/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.5-r2:0"
+RDEPEND="${DEPEND}
+	dev-perl/File-Tempdir
+	dev-perl/Socket6"
+
+src_prepare() {
+	epatch "${FILESDIR}/0002-Add-ipv6-monitor-support-to-mirmon.patch"
+}
+
+src_install() {
+	# Don't install empty dirs
+	MY_CGIBINDIR=""
+	MY_ICONSDIR=""
+	MY_ERRORSDIR=""
+
+	webapp_src_preinst
+
+	for file in mirmon.html mirmon.txt; do
+		dodoc ${file}
+		rm -f ${file}
+	done
+	cp -R icons "${D}"/${MY_HTDOCSDIR}
+	rm -rf icons
+	cp -R . "${D}"/${MY_HOSTROOTDIR}
+
+	webapp_src_install
+}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index a006b5e975af..bc0276fd3d4d 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1 +1,2 @@
 DIST redmine-2.4.6.tar.gz 3885107 SHA256 9dd35c9f50fcd20724c328860253c78fe0155a5f58bbf90357d72d44900a7601 SHA512 722bdb4e5dd5246dfdee2819c65d024c34368d4cbb34d27a2832909b2b82f6e677e7312fa085971c6fb78c2aa4d06552d06e2314e19c4e3d0b211fcc1ec4d911 WHIRLPOOL e1b4213f7aef6d97afadde194e6f99f6d7f61a5cc9775fb8619cda6fbe2b42a3b783039fdacfa80b40d0c86fa235d397f39f0d3d37b5a7626facfd70fe058f06
+DIST redmine-2.6.9.tar.gz 2127454 SHA256 15cafc3983e0520c3ecc6105ef33031f55b1dc2b21270d092938562b47362d4c SHA512 c376e0096e35c0307960c5e186abe2d8618064564813873e30aa0c9f7f6fcbf41b22239cf54e7aed794a0a06de9cd8b931d5c130776d4818428f788d0ef9e866 WHIRLPOOL 85eba2d64896ba96698b4449a1580987d25b725011feac969a612eb932da99fdd701d5f5808f26efef80dec86ebcfc505445f185fc8dec08d5909d2ce8a0b2d4
diff --git a/www-apps/redmine/redmine-2.6.9.ebuild b/www-apps/redmine/redmine-2.6.9.ebuild
new file mode 100644
index 000000000000..1249c70dc49a
--- /dev/null
+++ b/www-apps/redmine/redmine-2.6.9.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="A flexible project management web application written using Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="ldap imagemagick fastcgi passenger"
+
+#RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]"
+
+ruby_add_rdepend "
+	dev-ruby/rubygems
+	>=dev-ruby/rails-3.2.22:3.2
+	>=dev-ruby/jquery-rails-3.1.1:3
+	dev-ruby/i18n:0.6
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/builder:3
+	dev-ruby/mime-types:*
+	=dev-ruby/request_store-1.0.5
+	>=dev-ruby/rbpdf-1.18.6
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
+	>=dev-ruby/ruby-openid-2.3.0
+	>=dev-ruby/rack-openid-0.2.1
+	imagemagick? ( >=dev-ruby/rmagick-2 )
+	fastcgi? ( dev-ruby/fcgi )
+	passenger? ( www-apache/passenger )"
+#	ruby_targets_ruby19? (
+#		postgres? ( >=dev-ruby/pg-0.11 )
+#		sqlite3? ( dev-ruby/sqlite3 )
+#		mysql? ( dev-ruby/mysql2:0.3 )
+#	)
+
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#		<dev-ruby/nokogiri-1.6.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me || die
+
+	# bug #406605
+	rm .gitignore .hgignore .travis.yml || die
+
+	rm Gemfile config/preinitializer.rb || die
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
+	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	# Make it work
+	sed -i -i "1irequire 'request_store'" app/controllers/application_controller.rb || die
+}
+
+all_ruby_install() {
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
+	rm -r doc || die
+	dodoc README.rdoc
+	rm README.rdoc || die
+
+	keepdir /var/log/${PN}
+	dosym /var/log/${PN}/ "${REDMINE_DIR}/log"
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	else
+		newconfd "${FILESDIR}/${PN}.confd" ${PN}
+		newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	fi
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EPREFIX}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+	einfo
+}
+
+pkg_config() {
+	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
+		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
+		eerror "then edit this file in order to configure your database settings for \"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [ ! -L /usr/bin/ruby ]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EPREFIX}${REDMINE_DIR}" || die
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
+		einfo
+		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild b/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
index a7ab79401032..4b1d401ba318 100644
--- a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.44-r0.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 @@ SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="6"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
 IUSE="extra-webapps"
 
 RESTRICT="test"
diff --git a/www-servers/tomcat/tomcat-6.0.44-r2.ebuild b/www-servers/tomcat/tomcat-6.0.44-r2.ebuild
index d3f72ba39596..4c91ddae9ae7 100644
--- a/www-servers/tomcat/tomcat-6.0.44-r2.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.44-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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="extra-webapps"
 
 ECJ_SLOT="3.7"
diff --git a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild b/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
index 7fd086899fa1..af726e346fdb 100644
--- a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59-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$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+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?
diff --git a/www-servers/tomcat/tomcat-7.0.64.ebuild b/www-servers/tomcat/tomcat-7.0.64.ebuild
index 7072bb9e5e79..4b1dde5244ff 100644
--- a/www-servers/tomcat/tomcat-7.0.64.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.64.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 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+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?
diff --git a/www-servers/tomcat/tomcat-7.0.65.ebuild b/www-servers/tomcat/tomcat-7.0.65.ebuild
index fab694741468..dc4522178d39 100644
--- a/www-servers/tomcat/tomcat-7.0.65.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.65.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 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+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?
diff --git a/www-servers/tomcat/tomcat-7.0.67.ebuild b/www-servers/tomcat/tomcat-7.0.67.ebuild
index 2bcc4443d1da..cfc066197b85 100644
--- a/www-servers/tomcat/tomcat-7.0.67.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.67.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 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+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?
diff --git a/x11-apps/copyq/Manifest b/x11-apps/copyq/Manifest
index db3b0fd6b329..e408044be61c 100644
--- a/x11-apps/copyq/Manifest
+++ b/x11-apps/copyq/Manifest
@@ -1 +1 @@
-DIST copyq-2.4.9.tar.gz 1415277 SHA256 0736602eef82bd8ddfb7edb2a4c49b898897f7d25ddc2ae249ed50fd4406a8f4 SHA512 e790b2d7531a3e4eb3b88af720074ba35aedae8ef530ee89c78d798720fcf5668b52f4c7f27ea22828dbfac33dbf22260f69294e3fff587c2d05a36844210421 WHIRLPOOL 0cf03d36a9a7b1f1f62453af30b2301929d0ffc022c7e6290346fe6a9af11cb0a1a7a8128daf10fd73166a9ba4f6c9f2c57899229b1fc404ffe6b81dedfa3b78
+DIST copyq-2.5.0.tar.gz 1428790 SHA256 7726745056e8d82625531defc75b2a740d3c42131ecce1f3181bc0a0bae51fb1 SHA512 0489c95fe8365ef9d927e14ad42c01ff9533928e403edbb92d0b9935713d7944edab1f939f100f74a0ddb219c4cf57cedf955362f35d23c706e25c64de725cc7 WHIRLPOOL f41d6ee1bf4fea4ab38bb01b4ef26988bb9968f1a8bc6ed21637318e687419853fc406fe688f01bc83cbce90f67bd9f98db2e48cda80afebcb2bb9897b7e63a5
diff --git a/x11-apps/copyq/copyq-2.4.9.ebuild b/x11-apps/copyq/copyq-2.5.0.ebuild
index e33c6e6f1a1c..0f9fa1dc9baf 100644
--- a/x11-apps/copyq/copyq-2.4.9.ebuild
+++ b/x11-apps/copyq/copyq-2.5.0.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-
 inherit cmake-utils multilib
 
 DESCRIPTION="Clipboard manager with advanced features"
@@ -28,15 +27,20 @@ RDEPEND="
 		webkit? ( dev-qt/qtwebkit:4 )
 	)
 	qt5? (
+		dev-qt/linguist-tools:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtscript:5
+		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		webkit? ( dev-qt/qtwebkit:5 )
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	qt4? ( test? ( dev-qt/qttest:4 ) )
+	qt5? ( test? ( dev-qt/qttest:5 ) )
+"
 
 S="${WORKDIR}"/CopyQ-${PV}
 
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index e00b14a32725..e0ac5733bafd 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,3 +1,4 @@
 DIST gtksourceview-2.10.5.tar.bz2 1253321 SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d WHIRLPOOL 4bd2589d4e06bb5e5c4dc8c55af25c52fd2c2c318a1240d7a430c8cb442cc785b7048f0116d9df714f93c6c1cb87628459239a80ae317d8eb73d27e4c021281a
 DIST gtksourceview-3.16.1.tar.xz 1272152 SHA256 669e9846ca744ec4d04ce61377e85df7ca909ad476329922a6abf4da423f1b0c SHA512 8bae196d923d08e58c8f02d7612b32aa7caec8457c2ff35c2bb2322a3013a8f1fe52cbc62540f9d83054811ee517088d4e880b82733b2a73e7724a206b2ad911 WHIRLPOOL c51a0dd6ccad2262b289509f8dfa85675ba90cf4f0242358ca2d1ad857cf06e33ad0495560b726430738d827f9204c2eb63a90209171194a7c8eb163e46a1471
 DIST gtksourceview-3.18.1.tar.xz 1310248 SHA256 7be95faf068b9f0ac7540cc1e8d607baa98a482850ef11a6471b53c9327aede6 SHA512 dacee02c1d7232279b560bfa362c65837a981d50fdc28ae966835ead7b0d99310d503b816895c77c5b61967778299e4c9385697de5210259a97f664703bc905f WHIRLPOOL f1319df7219f2b8a36912acf335ff95cfb758117bba03c462f56c64a9917dea9ebef14eb35803add1a95892174b246d023691cbbe075c542a671559a000fb12b
+DIST gtksourceview-3.18.2.tar.xz 1317804 SHA256 60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2 SHA512 75e502264d7d9f63f9a2c9c884072cfc2d323c7cc49383b9b53916321ce20ef695e7a2dd0f6db67a4daf70ba84a3a907dfc6d9407ba5982adb976210e0589328 WHIRLPOOL 4143a624a0582a5d92de707b5167bc9805a5b484906977c4b0d195703d7bd113ebd677829f6e6c2c2d8d10cdae2041db99e8294e18e7114d53e15da6f233ad80
diff --git a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
new file mode 100644
index 000000000000..e4630af2bd46
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.18.2.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"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.24
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		--enable-providers \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README"
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index deccf1213fb2..9209773121e9 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,3 +1 @@
-DIST qtermwidget-0.4.0.37.tar.xz 158080 SHA256 a7614bad4821a1028d8796f7c88fd916fa2c01dead57ddd78929070972d417ee SHA512 1b244dc0f5326b39c44c6c330a9be676c085a5d8297e8947735ee553ee5c5acb2389b1bae737842fcc18b18d0e84a485a91b7d9745c8dcf42c28fcf14a313231 WHIRLPOOL 8429f1789b5015964a28b9930312d486bedb659f95034fb34ed9ed213a03cf40bfaa2d60f27ddec539acf79776bee690f7f6bf034e17eb910305e58bd27aa8a5
-DIST qtermwidget-0.4.0.tar.xz 152952 SHA256 c3e25499109db93cc169f8c7fdc8bd6c98e7712acc21a73e5d88148540582508 SHA512 2f2fe47531a0a0103956174ce69bbb954f0a1b4aedc0a6413825d2a4dc7ff000792a06d37bf0fc9f3f6caec963c831661eb79497217003c3c53b935fa702336c WHIRLPOOL 0fa3efa00cc4d98b154c6f4ae56ab60d2318c637ee544e32b39e2397cbd898ee0aa48762a7aeafe8de47e33b7b49b094421a765a4c1931c4ae7d33e3f9460620
 DIST qtermwidget-0.6.0.tar.xz 158312 SHA256 1ea148e67c3e28a53ca24a3c91532507ddd6c5d28611467e7a67334d945cd010 SHA512 2e6c5c4bee50244757aecf461c2f63f3d7306647693176df3587271129a3f12d188ea425d8db3704ec1c52df56d429b06472a7c628b5b916c0852752ebfdb79a WHIRLPOOL 55d3e9544f654dce4139f81e3d933a0d11e3e06e965671e4b17e590219e2e5e991b3bdb61db59203197789d943780f3f40d28f8b5d874479a44cc486ae9a6aad
diff --git a/x11-libs/qtermwidget/qtermwidget-0.4.0.37.ebuild b/x11-libs/qtermwidget/qtermwidget-0.4.0.37.ebuild
deleted file mode 100644
index 0ce86ae91611..000000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.4.0.37.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"
-
-inherit vcs-snapshot cmake-utils
-
-DESCRIPTION="Qt4 terminal emulator widget"
-HOMEPAGE="https://github.com/qterminal/"
-SRC_URI="http://dist.leechcraft.org/3rdparty/qtermwidget/qtermwidget-0.4.0-37-gebf7d6c.tar.xz -> ${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug" # todo: python
-
-DEPEND="
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild
deleted file mode 100644
index 387235664bc7..000000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4 terminal emulator widget"
-HOMEPAGE="https://github.com/qterminal/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug" # todo: python
-
-DEPEND="
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild
index 2bdc6985371e..979c9a926853 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.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$
 
@@ -8,7 +8,7 @@ inherit autotools eutils
 MY_P=${P/_/-}
 
 DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="http://portland.freedesktop.org/"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-utils/"
 #SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 #SRC_URI="http://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
 #	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
diff --git a/x11-misc/xdo/Manifest b/x11-misc/xdo/Manifest
index 3cc25e968afa..bb965d8eab52 100644
--- a/x11-misc/xdo/Manifest
+++ b/x11-misc/xdo/Manifest
@@ -1,2 +1,3 @@
 DIST xdo-0.3.tar.gz 6927 SHA256 4845d2d0ba6c55ca657b7fc02483bde26545502ee81e1495ee313dd5bca20e89 SHA512 b900d487f7daba67466ae2a3c318dd64ab2aa2d5f9954af8c93bc30262b23f86972c93e82df56da0801b60be5314e7870df6d7c4252ec00f4705e629d1197d31 WHIRLPOOL bb80a95872f646e97fb377ef50bf3be3f471936b68bc505432fe9d5e0eede0e0c13a04eb86314faadf63c3334af7a3006a88dae55979aca0473379d439eb0f6e
 DIST xdo-0.4.tar.gz 6544 SHA256 0b3ac57c6127799d18d27aa58b21d837b96525c6c6ae2f1433dc6d0a371e74ea SHA512 2299023be0abf5eea7c71c4513b9a7a6175a287ede233110291d2908ab417a389efe31b26c3fb8cc9e0017707b7accfac6785c1e1fe4154dcebceda3a6121cef WHIRLPOOL a5670d514e5f4279e088b2d4e3904d01464ff5864616bdbfc25ff65e1c3a160bc862441e120fbe313ab7ea9e16d7077c4c7edbc3715d6c39dec18c835182b6e6
+DIST xdo-0.5.tar.gz 6853 SHA256 2686cfbe3727586fae770a033731a92abd35146951961a5e0bf781288296566a SHA512 a33a1480d45b641e471a65b93ac6d5b8c1922559370590a49dd27f5ff139ad59484e4c82266f1a0c2e2c8d6d237a56fc7122424d1270f34f7b9ba616fd04e486 WHIRLPOOL d239fda4bc970c04aa03e0815d598a451b633d023a6277a6c1b330d18246ea36899c1e4c1095de3e8a0fc79a67771a674992331028c154347c7edae5ed1e3024
diff --git a/x11-misc/xdo/xdo-0.5.ebuild b/x11-misc/xdo/xdo-0.5.ebuild
new file mode 100644
index 000000000000..880c0bf7478f
--- /dev/null
+++ b/x11-misc/xdo/xdo-0.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
+inherit toolchain-funcs
+
+DESCRIPTION="Small X utility to perform elementary actions on windows"
+HOMEPAGE="https://github.com/baskerville/xdo/"
+SRC_URI="https://github.com/baskerville/xdo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-wm"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+}
diff --git a/x11-plugins/pidgin-birthday-reminder/metadata.xml b/x11-plugins/pidgin-birthday-reminder/metadata.xml
index 4726ce995764..17672ce6438d 100644
--- a/x11-plugins/pidgin-birthday-reminder/metadata.xml
+++ b/x11-plugins/pidgin-birthday-reminder/metadata.xml
@@ -7,11 +7,6 @@
 		<name>Julian Ospald</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
-	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-		<description>Maintainer. CC him on bugs</description>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.launchpad.net/pidgin-birthday-reminder</bugs-to>
 		<remote-id type="launchpad">pidgin-birthday-reminder</remote-id>
diff --git a/x11-plugins/pidgin-indicator/metadata.xml b/x11-plugins/pidgin-indicator/metadata.xml
index 9b198d3f3bd5..bc186e29e747 100644
--- a/x11-plugins/pidgin-indicator/metadata.xml
+++ b/x11-plugins/pidgin-indicator/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">philipl/pidgin-indicator</remote-id>
diff --git a/x11-plugins/pidgin-opensteamworks/Manifest b/x11-plugins/pidgin-opensteamworks/Manifest
index b3e06e8c6256..c9fecc0ebeb2 100644
--- a/x11-plugins/pidgin-opensteamworks/Manifest
+++ b/x11-plugins/pidgin-opensteamworks/Manifest
@@ -1,6 +1,3 @@
 DIST pidgin-opensteamworks-1.6.1.tar.gz 750495 SHA256 6a63248ed67f85185d32760246a22fea58e49af2d8a604abaa2cb3a3b5368a01 SHA512 9f025538460dda01d769501326cf7ac597e069bdef3437eea89f392bede7e620e854a8c0b0659315a0834c8f2f60a38680f1f1bdccdb65d3b13f64f7981ee55b WHIRLPOOL 30e13bbd16b560b690a38214d1fadfd4a6da7566e29035623e7b6178357baadd647c692257f251803112e61baa25aaff59281fdc70e49d9fbdf90effa023eac1
-DIST pidgin-opensteamworks-1.6.tar.gz 750167 SHA256 57dc7a3f13a5064f4374c76e693bc8f7a4f19c589949beedb7c739946bfa3e4e SHA512 1b536d4e5b34fbeb5dd48ffab30a03e17b94359d8d6243ab9482b1c0c1e404cb56a62d8f878b478e83c9d81d44a4d77eb6b9695a942dc817b445c9d7b751d58c WHIRLPOOL 679f38ff4d954db580d8185ca5edebcf5a78515b5e5c1d4a634e7f7ed9caf684c698837836ab09e0195916b0b239fd90aad37db5416f3982d912a99ebf98bee2
 DIST pidgin-opensteamworks-icons.zip 3252 SHA256 9af30f18b607fd16911c2e41b0fb594508583335804f25193da7846ea39f9fa9 SHA512 823f400bb4df9c6ddb65d8a01ec182fbbadeb955bc3e9590e88773b092b0cf79e50fc6c20d9b72def7fe9f8d6e1ac7cc087fbdb3f6ed4b76c343a29f18e6ea06 WHIRLPOOL 6b57fd61f15755b4c8f5090d7ab94974e1d8e5bd873fdc943ae762b3db97c0b65b295f8288747c98390fb1f52af27849840b084ca0e39bd88542f694decf0ff7
 DIST steam-mobile-1.4.tar.bz2 23293 SHA256 d7ac0396b17c7a45bdffaa4b1ccbc4b13118b64e9ea495fa5af629a8e29c8fab SHA512 20ac50ea49c1c0724aeb839fe46ac8a9b5a52d903ebf9bb18ab665fd32cdc4d80a426a0c2714724495ee73d758da2dbb891ac618b0689239485841fe6e6c0953 WHIRLPOOL 9f9e6ed0c1045e2fada9ea214b2be9560fc6d5937619cda403242c30ad8b1a4536fb6c0a92c311ca2998aed245d2fee5da9b48a6c8766e5c098688552bee6da7
-DIST steam-mobile-1.5.1.tar.bz2 25491 SHA256 4a309923bf75a8095706a38604634ffc9bb91fc90e01c55fa6dcf9c8177ecd23 SHA512 71b83155bbd00bd208c07b797f2021eed33e0aadf321025cf3b2e9bd50399cefd9652b3ee5ea79009876a306e9d07177686861de405355ac8c2a914ebefe8557 WHIRLPOOL b1c4933b91828e405f1bf7dc148eee92501601e49fec0594b55a07e3a7175b3780abfd67a3ec8f297212bf3e690054e7403abcc45bdb0c6633e05a54970a0e3e
-DIST steam-mobile-1.5.tar.bz2 25284 SHA256 f4a90c771ab92e2a330c7c00a8ba874a5e71fbc1ff29e8ad2a0c22fa09d522a1 SHA512 14dd135d6b973a3bd8e2c4973bdb83e3ea1b3f2821e42f1ecb079e067daef0ef6fc9cedd1be45eac3065bfede5efe9216b26afefa742836f9d6ac2dd241c4c74 WHIRLPOOL 30cf5b1699ca88216e702d359262fd1e1cc3608544ecab5b5d427db8bcf4a9580d51b108bd584b6a7c28573d383570ba0f9c73b2e9974cee9a18a8da084a7d5e
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.5.1.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.5.1.ebuild
deleted file mode 100644
index a819f2e3e1dd..000000000000
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.5.1.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 toolchain-funcs
-
-DESCRIPTION="Steam protocol plugin for pidgin"
-HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
-SRC_URI="https://pidgin-opensteamworks.googlecode.com/svn/trunk/steam-mobile/releases/steam-mobile-${PV}.tar.bz2
-	https://pidgin-opensteamworks.googlecode.com/files/icons.zip
-	-> ${PN}-icons.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/nss
-	gnome-base/libgnome-keyring
-	net-im/pidgin"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_prepare() {
-	# see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
-	cp "${FILESDIR}"/${PN}-1.3-Makefile "${S}"/Makefile || die
-}
-
-src_install() {
-	default
-	insinto /usr/share/pixmaps/pidgin/protocols
-	doins -r "${WORKDIR}"/{16,48}
-}
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.5.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.5.ebuild
deleted file mode 100644
index 3389f7858141..000000000000
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.5.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 toolchain-funcs
-
-DESCRIPTION="Steam protocol plugin for pidgin"
-HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
-SRC_URI="https://pidgin-opensteamworks.googlecode.com/svn/trunk/steam-mobile/releases/steam-mobile-${PV}.tar.bz2
-	https://pidgin-opensteamworks.googlecode.com/files/icons.zip
-	-> ${PN}-icons.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/nss
-	gnome-base/libgnome-keyring
-	net-im/pidgin"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_prepare() {
-	# see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
-	cp "${FILESDIR}"/${PN}-1.3-Makefile "${S}"/Makefile || die
-}
-
-src_install() {
-	default
-	insinto /usr/share/pixmaps/pidgin/protocols
-	doins -r "${WORKDIR}"/{16,48}
-}
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6-r1.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6-r1.ebuild
deleted file mode 100644
index 6d7ea1ce8976..000000000000
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Steam protocol plugin for pidgin"
-HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
-SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/nss
-	gnome-base/libgnome-keyring
-	net-im/pidgin"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_prepare() {
-	# see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
-	cp "${FILESDIR}"/${PN}-1.3-Makefile "${S}"/${P}/steam-mobile/Makefile || die
-	unzip "${S}"/${P}/steam-mobile/releases/icons.zip || die
-}
-
-src_compile() {
-	pushd ${P}/steam-mobile || die
-	default
-	popd || die
-}
-
-src_install() {
-	pushd ${P}/steam-mobile || die
-	default
-	popd || die
-	insinto /usr/share/pixmaps/pidgin/protocols
-	doins -r "${WORKDIR}"/{16,48}
-	dodoc ${P}/README.md
-}
diff --git a/x11-plugins/pidgin-otr/metadata.xml b/x11-plugins/pidgin-otr/metadata.xml
index 3e2b4181f5be..c9169515bdf5 100644
--- a/x11-plugins/pidgin-otr/metadata.xml
+++ b/x11-plugins/pidgin-otr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 8c3715f4448d..3b3a2bb2e69f 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,3 +1 @@
-DIST qterminal-0.4.0.tar.xz 83256 SHA256 f939358e2a31aaeb656d59ca919bbdba2fa78c2b99e691b9cfcd8259e80a495e SHA512 ac858eaac34fc346e6498146307c98b95f133df5a435af01842427f06362c5afb8817197981a0d3aa79f25321117050c80305a978260127a23a252d3a98027eb WHIRLPOOL b78eb321567803cceb4579637ead93c3bfe2cf9148ecdc9565b0a34dbe791a77eac3f567366a1e5152b17181eb7447b734a81ad3cc4b7763c7ca94d0ced1c0ae
-DIST qterminal-0.5.0_p20140913.tar.xz 99988 SHA256 965ad96262d22fc88a465f60f5d0f66d650fa8380a906dc70d4eae06b874430a SHA512 8f3a360be2e173c06ab454f0c6e9ac71ecf305ad46c9ad16ff37b3174a160624266ac2c2bd5588a805bcb72aab2c9774ca159eba7e3d2db85a970350fc51da09 WHIRLPOOL a3c7011e75d93888b9de95ddd25bdada4511bd4bd0e02e8af3f1413715efaa7cd9e2d77f8739fd46c5484c2c3f930e8dedbb2ef7a80feff5f97e5ef31d2f03b1
 DIST qterminal-0.6.0.tar.xz 100660 SHA256 61121ad0d1d34a5129e1109b6689d7fb7b10130a32831eaf500a86909b29d9bc SHA512 e51b768dc9b467800c7439bf7b021e04d83073a236023632e76ba00551bffa70f3b96f2098c68092283287914ce9103c8dfae8af79c9c25e119528b3f102ab34 WHIRLPOOL 4d67cce15b1ced30916f123ad140f3b00237bd5f4535fe0fb9adbd31829cfdb3120b6788f29cb9545d23d892c6ce22970793c0afed2e5ed225ba8e9a2487a88d
diff --git a/x11-terms/qterminal/qterminal-0.4.0.ebuild b/x11-terms/qterminal/qterminal-0.4.0.ebuild
deleted file mode 100644
index ed57a5ec8972..000000000000
--- a/x11-terms/qterminal/qterminal-0.4.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="4"
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based multitab terminal emulator"
-HOMEPAGE="https://github.com/qterminal/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
-	x11-libs/qtermwidget"
-RDEPEND="${DEPEND}"
-
-#todo: translations
diff --git a/x11-terms/qterminal/qterminal-0.5.0_p20140913.ebuild b/x11-terms/qterminal/qterminal-0.5.0_p20140913.ebuild
deleted file mode 100644
index b0000202c4a8..000000000000
--- a/x11-terms/qterminal/qterminal-0.5.0_p20140913.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
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based multitab terminal emulator"
-HOMEPAGE="https://github.com/qterminal/qterminal"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	x11-libs/libqxt
-	>=x11-libs/qtermwidget-0.4.0.37"
-RDEPEND="${DEPEND}"
diff --git a/x11-themes/gentoo10-backgrounds/metadata.xml b/x11-themes/gentoo10-backgrounds/metadata.xml
index b896643bcae6..63ac5653603a 100644
--- a/x11-themes/gentoo10-backgrounds/metadata.xml
+++ b/x11-themes/gentoo10-backgrounds/metadata.xml
@@ -4,7 +4,4 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
-  <maintainer>
-    <email>release@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
index 70e77ed75f51..e2ceeafe1422 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/qtile/Manifest b/x11-wm/qtile/Manifest
index 1d8be709b203..32f40f59ae5c 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,7 +1,2 @@
-DIST qtile-0.10.0.tar.gz 300186 SHA256 d340b1f6df8d78e1f8868ad22862056ed38267fd2e44538361449e6079412948 SHA512 198d572b27f1e1c7636c7cb0ff5751494c72e919259c67e08eecc0c8c64018d1b64df66840146fada4f128ac69a9fa6b8c39572473ff6c4addee609011b7bc28 WHIRLPOOL 05564ec65d7d96b0dc6085e346f071b7d803017d1c23ce24d1312b036c5c36dbf24308ad634553c8c462695f423d52c30f00d21d572e3609d32ea446bf2489a1
 DIST qtile-0.10.1.tar.gz 300217 SHA256 24fc598ca73d2e95ddf4bc29cbfb638253696dafba0ffaaadb103392d248fe96 SHA512 dec5555107d5b99dea21cf95ba3a79fb1a0c6a7628d26abab5bcedbd1898664b477c4e2fe03885d7d27abd757908878d46ace33ca20e94ba04dba41e742dd52b WHIRLPOOL 455f5bb6bf885e7e403100cae7c839482a6e9236f237ae0d71a52e9064ec15a335462653a6ed8dd9c128606090fc4bfe230e54492efe47f1bc65460e0a781dac
-DIST qtile-0.5.tar.gz 317041 SHA256 f80cd73d6655ab53baa6ae11afb9561f724515052e4ba570e6e978abc78c1167 SHA512 2af8a13dcc355b4f556e77a7c78235eb39e9112631750d6680cc1d96c7895ffd3c8ac937ec8b796f4e3f841d39b10aafb930b440addfd8e2fc951e2010e3dc98 WHIRLPOOL d88f70906de570d129aae38ff9ca7a829aa1d9b6d61a179a0cf4ad798d9314c9364a905739168a60b9c37384c13034172920c76cef0981a26df04544e94fe472
-DIST qtile-0.6.tar.gz 257000 SHA256 73508a5ff18579091434131c54aaa3fd4413abe9df4b56962dcbcb6196f1bb36 SHA512 512961f6a47d52d055fe1f7889a5e0c00fe95c55c25f88d1c0d0d3b0253a65579dcbe2cd5c17e04d8a5533e0befc7548c459d64961e2f11f3944803de29e1c25 WHIRLPOOL 5daa3c1464f714c633ac58bb5d56ddcfb8949850475ed155e03eb1ec444c002e4b4f47a3637d2c4e510fea94d69ef1cdc4c8e647bc29dcd62cffb1b95c2326fe
-DIST qtile-0.7.0.tar.gz 265068 SHA256 12bb01dd30d65ed44994f17c2a0e2803b34c108108ac2085aa81e3cd8f3264d9 SHA512 facd319a979bf5dd2ec9c336a203dce197678bcaf02df3208e0ff49cd254683242a76c884f1dccda1689a421a680834aa4194f250e93bbfcf048119148730171 WHIRLPOOL 18024c465cce95f703e2d9bf25f4d4a68197f0429a2c0edadf2e34807127b8248ed80408515ff9d254eb026853350e9291c1da719fe5144608f35eb002c3b26c
-DIST qtile-0.8.0.tar.gz 275673 SHA256 1d7d27da9277ee91e6d60310065be39823c01c715a475935accdb89d3e8e9e98 SHA512 80574b67f46488e384fd4e21e3217d94de9a6a49394fb108775bf89243600d501f104adb260e84ed42312828b4ae0928bfde9b8737eed07060bfc50fb69778d5 WHIRLPOOL e5af8c2b38d4a77dc1c23ea3c3d78210374e4471e8816d1a457cdb8ec240efba95d649f3e3bb53ba46ee3fc7e57c94cac4409122f828efcd17ed4caa2656f142
-DIST qtile-0.9.1.tar.gz 285933 SHA256 c0ccf38a7e13f2663fe80d546c2a849384ad3698253d633fe33bd99163f9418d SHA512 5453b95ffa02b2f5ba04696bd29a662585bdfe5fa33d68c3b8a654d49279bba3029decf27ac47209630d5ac1dd8fbd21359799d72ce517eda13860ff8eaaa9a4 WHIRLPOOL 9295d9f8b9ab96ee983f32d843ff7d882e4d725f8b8d8846f53a6dbfd8bf17de84d730c7aa0a3a8cefd77af74ec287f63543046e162e898649b136e1f332a06a
+DIST qtile-0.10.2.tar.gz 310115 SHA256 ce4cc2661d089c21aa4537302cdc72ddce02d1ce07c62002080f4fa6c50f2ce2 SHA512 047fed98c447c65bdc3499adc678f49920f47f5167f65a85407f60d4e180159a8657f8483b8e19db4de1db876e621182e691aa70728ac7cc4abfa096b67a45e6 WHIRLPOOL 37f81d2eb60249168c94c29be8fafc611f4b7f1ed43c5288df9f7033e917425a04c96c40dba70d09045da18bae8ac6ec8b2700add61820bd66654c65a485da74
diff --git a/x11-wm/qtile/qtile-0.10.0.ebuild b/x11-wm/qtile/qtile-0.10.2.ebuild
index b59d1b106ae2..4a120e2442d6 100644
--- a/x11-wm/qtile/qtile-0.10.0.ebuild
+++ b/x11-wm/qtile/qtile-0.10.2.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_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1 virtualx
 
diff --git a/x11-wm/qtile/qtile-0.5-r1.ebuild b/x11-wm/qtile/qtile-0.5-r1.ebuild
deleted file mode 100644
index 7db2d3cd7963..000000000000
--- a/x11-wm/qtile/qtile-0.5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot virtualx
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/pycairo-1.10.0-r4[xcb,${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=x11-libs/xpyb-1.3.1-r1[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/python-xlib[${PYTHON_USEDEP}]
-		x11-base/xorg-server[kdrive]
-	)"
-
-# tests fail due to xauth errors from python-xlib
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst TODO.rst )
-	distutils-r1_python_install_all
-
-	use doc && dohtml -r docs/_build/html/*
-
-	insinto /usr/share/xsessions
-	doins resources/qtile.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-}
diff --git a/x11-wm/qtile/qtile-0.6.ebuild b/x11-wm/qtile/qtile-0.6.ebuild
deleted file mode 100644
index 199463e01936..000000000000
--- a/x11-wm/qtile/qtile-0.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/pycairo-1.10.0-r4[xcb,${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=x11-libs/xpyb-1.3.1-r1[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/python-xlib[${PYTHON_USEDEP}]
-		x11-base/xorg-server[kdrive]
-	)"
-
-# tests fail due to xauth errors from python-xlib
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	distutils-r1_python_install_all
-
-	use doc && dohtml -r docs/_build/html/*
-
-	insinto /usr/share/xsessions
-	doins resources/qtile.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-}
diff --git a/x11-wm/qtile/qtile-0.7.0.ebuild b/x11-wm/qtile/qtile-0.7.0.ebuild
deleted file mode 100644
index 1c538a26eaf7..000000000000
--- a/x11-wm/qtile/qtile-0.7.0.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="git://github.com/qtile/qtile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/pycairo-1.10.0-r4[xcb,${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=x11-libs/xpyb-1.3.1-r1[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/python-xlib[${PYTHON_USEDEP}]
-		x11-base/xorg-server[kdrive]
-	)"
-
-# tests fail due to xauth errors from python-xlib
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-
-	insinto /usr/share/xsessions
-	doins resources/qtile.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-}
diff --git a/x11-wm/qtile/qtile-0.8.0.ebuild b/x11-wm/qtile/qtile-0.8.0.ebuild
deleted file mode 100644
index 1c538a26eaf7..000000000000
--- a/x11-wm/qtile/qtile-0.8.0.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="git://github.com/qtile/qtile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/pycairo-1.10.0-r4[xcb,${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=x11-libs/xpyb-1.3.1-r1[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/python-xlib[${PYTHON_USEDEP}]
-		x11-base/xorg-server[kdrive]
-	)"
-
-# tests fail due to xauth errors from python-xlib
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-
-	insinto /usr/share/xsessions
-	doins resources/qtile.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-}
diff --git a/x11-wm/qtile/qtile-0.9.1-r1.ebuild b/x11-wm/qtile/qtile-0.9.1-r1.ebuild
deleted file mode 100644
index fd21c24c9f46..000000000000
--- a/x11-wm/qtile/qtile-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 virtualx
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
-
-RDEPEND="x11-libs/pango
-	>=dev-python/cairocffi-0.6[${PYTHON_USEDEP}]
-	>=dev-python/cffi-0.8.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/xcffib-0.1.11[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-base/xorg-server[kdrive]
-	)
-"
-
-RESTRICT="test"
-
-python_test() {
-	VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	distutils-r1_python_install_all
-
-	insinto /usr/share/xsessions
-	doins resources/qtile.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-}
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index b59d1b106ae2..4a120e2442d6 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-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
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1 virtualx
 
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 655e92802a5c..5a163ac43760 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,2 +1,3 @@
 DIST xmonad-contrib-0.11.2.tar.gz 401758 SHA256 515d87838ad1f9622d0b491390c5961318d2cb84c96410dee91b5653c5388c62 SHA512 373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910 WHIRLPOOL 8356462938d9565ee010335c90646d5f23adf3b830bbf7727ef8fa89ff6c027ff94be44b99260ae3c57f9773b6cf985029ba2f183cc7b8c9e18d18fd260f90a9
 DIST xmonad-contrib-0.11.4.tar.gz 401743 SHA256 a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7 WHIRLPOOL 1f25fff0088f15942bddd6a8e285fcf283f723527cc10b120c81cbb9a74a56106d5f7c5f676cf6b3fcd118bc3843e510169161898267f160c73b35c0fba458df
+DIST xmonad-contrib-0.12.tar.gz 464978 SHA256 131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311 SHA512 5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056 WHIRLPOOL 6618b4afafa8961745dda180c6375b9afdf48211eec93e561f450a3cb4d13a163dbc5175edc297cd324a9f3866a45d3b74cef59001a62bc0141908967d4b9688
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
new file mode 100644
index 000000000000..929d3724d142
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	>=x11-wm/xmonad-0.12:=[profile?] <x11-wm/xmonad-0.13:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index e2d8ead4b4c7..b0d194639aff 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,2 +1,3 @@
 DIST xmonad-0.11.1.tar.gz 59307 SHA256 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd SHA512 4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528 WHIRLPOOL 5707bd5763f525b196deea6ead806af74707e2bbd31ff67039b292f3b97f607c2351ef45e57373f0f7313e5c307335cb5f4a84820d8e658b7d864927f109891c
 DIST xmonad-0.11.tar.gz 59119 SHA256 e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc WHIRLPOOL 9bab495c4094f21427afa797f97b6af13d9c156484b33087b6378191b0d99255f070adc09df3da9eba3ff55a59a8f03830110a4ab2aa9ad9d93d2f1a35d5dc54
+DIST xmonad-0.12.tar.gz 61436 SHA256 e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7 SHA512 e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab WHIRLPOOL f0d37d35a9730b68b38c46ec7694ccd922b2fab96b3e8d99d007ccb887a06b3f88e6f1ea818124d427378246caab1f7d3ec4338eab1007431cdf5a19fc1cc3b9
diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
new file mode 100644
index 000000000000..79bd2c2d21fa
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
@@ -0,0 +1,40 @@
+--- xmonad/src/XMonad/Core.hs	2010-09-05 05:11:42.000000000 +0400
++++ xmonad/src/XMonad/Core.hs	2010-09-18 07:59:14.000000000 +0400
+@@ -65,6 +65,7 @@
+     , waitingUnmap     :: !(M.Map Window Int)            -- ^ the number of expected UnmapEvents
+     , dragging         :: !(Maybe (Position -> Position -> X (), X ()))
+     , numberlockMask   :: !KeyMask                       -- ^ The numlock modifier
++    , keyPressed       :: !KeyCode                       -- ^ keycode of the key being pressed if any
+     , extensibleState  :: !(M.Map String (Either String StateExtension))
+     -- ^ stores custom state information.
+     --
+--- xmonad/src/XMonad/Main.hs	2010-09-05 05:11:42.000000000 +0400
++++ xmonad/src/XMonad/Main.hs	2010-09-18 08:03:11.000000000 +0400
+@@ -129,6 +129,7 @@
+             , mapped          = S.empty
+             , waitingUnmap    = M.empty
+             , dragging        = Nothing
++            , keyPressed      = 0
+             , extensibleState = extState
+             }
+     allocaXEvent $ \e ->
+@@ -190,10 +191,15 @@
+ -- run window manager command
+ handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
+     | t == keyPress = withDisplay $ \dpy -> do
+-        s  <- io $ keycodeToKeysym dpy code 0
+-        mClean <- cleanMask m
+-        ks <- asks keyActions
+-        userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++        kp <- gets keyPressed
++        if kp /= code then do
++                modify $ \s -> s { keyPressed = code }
++                s  <- io $ keycodeToKeysym dpy code 0
++                mClean <- cleanMask m
++                ks <- asks keyActions
++                userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++            else return ()
++    | t == keyRelease = modify $ \s -> s { keyPressed = 0 }
+ 
+ -- manage a new window
+ handle (MapRequestEvent    {ev_window = w}) = withDisplay $ \dpy -> do
diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
new file mode 100644
index 000000000000..305a0c7bf5e7
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -generatemanpage,-testing
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="+default-term no-autorepeat-keys"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/setlocale:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/quickcheck-2 )
+"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_prepare() {
+	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-0.12-check-repeat.patch
+
+	# allow user patches
+	epatch_user
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generatemanpage \
+		--flag=-testing
+}
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+	dohtml man/xmonad.1.html
+
+	dodoc CONFIG README.md CHANGES.md
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}